From patchwork Wed Jan 18 19:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 45432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2517647wrn; Wed, 18 Jan 2023 11:21:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXuaivgTTZvaV046g0Zv7TrXZ8MJiz8am4MhQ3Krxpg90tvgPAbWNoIKKthWavPDga5ai4En X-Received: by 2002:a17:906:df49:b0:84c:f9b0:b54a with SMTP id if9-20020a170906df4900b0084cf9b0b54amr6795411ejc.58.1674069672540; Wed, 18 Jan 2023 11:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674069672; cv=none; d=google.com; s=arc-20160816; b=FgUkUF28SicVc6C+eOCISH1xa9orDyZtjaHZrE+CidsVvGz6gb0UATLI08j5cSq9Vm 9cgdhi8WdT+h0MeGRv82HOiLtDgIHvfeI/pRI1pJWI2cHhplzgSgFo7zY6J854VjDfbm 3TRBLU01B2Mhr7DWldrghbxGYlTOLzhObKT0PD1LP43/HeTNRj7fARSgz774VX4A9Gae /QkVseHsvTHRs1T/YOzd/QrRjTdpNnDbSarYrQfw1qU2/5crwyoCdpIqfrbnVe5fNXTZ wh2DMkYiZfbW+LYg/MoG7+cC1TS1WxFC0V+/Txzs1gpe7EO3CyVcT/uoQ/pwCu+GPw+8 X8gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TbdXcXvadWanZx017JubbE729weboPIIX/66DtTtskE=; b=mHXqEJglRKs3teAbar0Uquvk8/xSRBTyAuVnVDv9fKYQimaHoS7aXk7OIpmsKKY5iR dsLlEjjccF4weyk/9fDLaGYEIBKiv0gfmxZd2z61qYaHoelrDgfkdA1VyFXW1xg3GjyV u9s4IqzZYmMM8SMFVENdW01/fAxN8nMaETApi+yK8taHVVHKnlzjIBDpydXtyKv1NN6H chaG0wlZ8o3T9ZYTxeVHo8VuT/D9nO+9Q/884LMIKmVZc61DhSSPw+rZtA1Ys+cV5SFh WcDhc6XiWvyK2ZEd8R2OZZIEsUcru9ilCxq5WsXJyqIM/BZQd75KUAUM8FncaDzRIIpA WGTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=EUD7YRa2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga8-20020a1709070c0800b00870558f5f0fsi13564860ejc.256.2023.01.18.11.20.48; Wed, 18 Jan 2023 11:21:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=EUD7YRa2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbjARTTB (ORCPT + 99 others); Wed, 18 Jan 2023 14:19:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230151AbjARTSv (ORCPT ); Wed, 18 Jan 2023 14:18:51 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB1E153B1A; Wed, 18 Jan 2023 11:18:50 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AC6CB158E; Wed, 18 Jan 2023 20:18:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069529; bh=mqcrmgKlmNwZ/4j0H9w4QnhJtOQYVKklQnpKaMrxgQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EUD7YRa2wdvmnQC4BXu+KgSvft4jaJHEjf3GNj1no0n1//Q0kZWtAhO/3BJ4AGM1U Pe8RhT3MVjGzNW+NDfnSwOZCA2tKpbKd3iq/NzKmGp+koTgvUZIbjyXmMS05m+kdyZ gqlLMQd9Im+UcrPVz66i+CKmv7imxcF1+DUbhAD0= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 3/6] vc04_services: bcm2835-camera: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:08 +0530 Message-Id: <20230118191811.208552-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755389281132097986?= X-GMAIL-MSGID: =?utf-8?q?1755389281132097986?= Drop the include directive they can break the build one only wants to build a subdirectory. Replace with "../" for the includes, in the bcm2835-camera files instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-camera/Makefile | 4 ---- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +++++----- .../staging/vc04_services/bcm2835-camera/controls.c | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 3494c82b271a..203b93899b20 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -4,7 +4,3 @@ bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \ controls.o obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o - -ccflags-y += \ - -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../vchiq-mmal/ diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 797ebe2a973a..4f81765912ea 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -26,11 +26,11 @@ #include #include -#include "mmal-common.h" -#include "mmal-encodings.h" -#include "mmal-vchiq.h" -#include "mmal-msg.h" -#include "mmal-parameters.h" +#include "../vchiq-mmal/mmal-common.h" +#include "../vchiq-mmal/mmal-encodings.h" +#include "../vchiq-mmal/mmal-vchiq.h" +#include "../vchiq-mmal/mmal-msg.h" +#include "../vchiq-mmal/mmal-parameters.h" #include "bcm2835-camera.h" #define MIN_WIDTH 32 diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c index 5644d1d457b9..6bce45925bf1 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c @@ -23,9 +23,9 @@ #include #include -#include "mmal-common.h" -#include "mmal-vchiq.h" -#include "mmal-parameters.h" +#include "../vchiq-mmal/mmal-common.h" +#include "../vchiq-mmal/mmal-vchiq.h" +#include "../vchiq-mmal/mmal-parameters.h" #include "bcm2835-camera.h" /* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -4.0 to +4.0.