From patchwork Thu Jan 19 11:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 45711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp287141wrn; Thu, 19 Jan 2023 04:04:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXuXPjr2SGtdjl2HJtcFGlsq5FkydqJIOTmwkTbnb95OIYp+sViAoD4OT/bD5dGq6XewfB32 X-Received: by 2002:a17:906:fad4:b0:7c1:2529:b25e with SMTP id lu20-20020a170906fad400b007c12529b25emr11167530ejb.43.1674129862023; Thu, 19 Jan 2023 04:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674129862; cv=none; d=google.com; s=arc-20160816; b=ZjZ+P/CVNlRL+fRM5b6+gCLI8UzXdMZfbe9Rw4ztxrYbSb93CoWBiXH1ZvEpdTKIwg jvHAy3Y3++qSC8fQ52GcYRiaRZhdw4Dux+uc93NPGbgV2vYPN7Eg/UpYPotU3ood+K0h ImsT+n3nzEcSURPlKw0T5ywYvJgM6mHdv+W+Pju1yTCV3LLddr3zdy/lzZ/JgrblxSwJ fCtfu4wQClT3X+SVb//5hJm4R98VkrnTyDjfZiyJSOVjowLuKDoCAY/1jEIUMOwIpHED Tv/e73Uxt6o2n8JUK5Vrgi4tDzH3s4p6WfwL0+7TU+ojFcRRJ0OwEAhM7NbWYtVpSbpf MiHQ== 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=MgS0yD8BPdGpwfi2Q7IlQ/AS0AcPUTeMBuEAECH6WqU=; b=HMtTF4XvvNIvE84/mmHX6CfmVFQI+vlx0OXuqzIRecrweDWh4mJSz+q5nRmveWNWOk RdQrCzSVxB8C3CkM5JaQKXx0qlBcCZzddkwudGQvt6Cc/m8bKNGG5gmfq3daRDp3eKXu iLWb2WtTlHkuc8G2cY6cGSvxRqbKb2l6D1tucE06pKDJeq0oBJC09hZz0ea13BvWm4yv Y2Prqu46w/1mH4n8KHe7P/s+ttn84zhaQ4AkrASgOEmpCOJAVGcBr0Ea3yTFXKpIc/N6 /6WBUErBgqVFo0nZkuTa/15aWDZQ9+rSXAVRpSGLxcejH0bwETYbrR3br00ASvSRoi7F yynA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=mBvtK0Ns; 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 dm3-20020a170907948300b007da4fe085d4si9377622ejc.694.2023.01.19.04.03.58; Thu, 19 Jan 2023 04:04:21 -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=mBvtK0Ns; 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 S231225AbjASL4G (ORCPT + 99 others); Thu, 19 Jan 2023 06:56:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231196AbjASLz5 (ORCPT ); Thu, 19 Jan 2023 06:55:57 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6776571784; Thu, 19 Jan 2023 03:55:42 -0800 (PST) Received: from ideasonboard.com (unknown [IPv6:2401:4900:1c80:b229:a6c1:a673:925f:1ed6]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 11FBF904; Thu, 19 Jan 2023 12:55:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674129341; bh=5uZPDNBAVgla1XWWQJSwoTOJpmT0TnxJ5fUoIq0dTDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBvtK0NshbuMl/lObkeUD/duaD/IZ5CQ/hEq2A1kaF/MtaOGNgTLQeCtZEr03r3rx L1Qz4/mIFgEQ4J1P4MENXMMKLLgGXyCzexMKa35vlBi/zdhYIXzLzpy6uB91g1fk5z KapZHxMZUR+J8gwsuhLsvVLAczz1O7Oh8eMHlVzs= 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 , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Paul Elder , Umang Jain Subject: [PATCH v5 3/6] staging: vc04_services: bcm2835-camera: Drop include Makefile directive Date: Thu, 19 Jan 2023 17:25:00 +0530 Message-Id: <20230119115503.268693-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119115503.268693-1-umang.jain@ideasonboard.com> References: <20230119115503.268693-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?1755452394131966421?= X-GMAIL-MSGID: =?utf-8?q?1755452394131966421?= 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 Reviewed-by: Laurent Pinchart --- 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.