From patchwork Fri Jan 20 20:11:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 46616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp404336wrn; Fri, 20 Jan 2023 12:12:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXtWVSi/MrxwIBwtpmcl6PwNFXrWI6xZD/qwc/ZjivcDXDa2ZetFG+E19EXCF26D5dagd2yB X-Received: by 2002:a17:907:c99c:b0:7c0:d6ba:c934 with SMTP id uj28-20020a170907c99c00b007c0d6bac934mr10680796ejc.13.1674245567278; Fri, 20 Jan 2023 12:12:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245567; cv=none; d=google.com; s=arc-20160816; b=Q6HFKgsJShFy0YTBqQdY469iZ3HhiHgZbBSLnFQNPnpue742pbMqI7ZI9VVGdNWcIk 26tDFguWwsOMsltMtxXcogT3c4pSUXH5csDXt9hqYOq5E244mWHUByqNOXhCyGcZM+MM XDKR1zym2gh7QbwNcUbAFvSfpDwkvMzxpZCHbnon+yspb5OE02uTIEWiSfTpuMXHrSY8 CisJYwBCactyVxznnZCyllOgy9iElXczUsE02fGMdIhWbcpru4FcAxe8SkZO3GBrV057 9t2MCdlahrAORbJMJtDGePxLNd6RLen1dDd09EWrBM3x0lAgIorDzeeH4zLW09xRPE70 p46A== 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=BZMhQRR+8sxbDzeopux3+mkdLFL+9h9tfFrhC+w00so=; b=eONYv/6pW8rMyWumJ2+8ujDutWQ2Sn3d0fAycrd9XaOGWAB0b6R/lRM/h52UsuDFB8 SU4qpCvGJM6UXbbgMPBHlhUxwOo4pEFtNGIWQvzkLcXRCubqAzokxH63R2Q9PpPyM50q UpdFn1YvhHnLOyq5/8tYFvvKwqmfLMAiQ+EC3jnYBk0OgKl84hzPdqCE9dlDu2XBD1IO qkF3a1nquePytQJaOLVmE1Nf++4q4Fd4uaYFc9faypllWPrs7qQxDn1h5xl+QTHOJwo6 /MoKHsvH++X/OH730woheJYkhSZ2qbJuujiPWZFjSkKhS7c01//w+AYBy7QHySWSidlE bbiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=I8jBM2xd; 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 he36-20020a1709073da400b0087203e71c56si16948388ejc.406.2023.01.20.12.12.23; Fri, 20 Jan 2023 12:12:47 -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=I8jBM2xd; 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 S229944AbjATULo (ORCPT + 99 others); Fri, 20 Jan 2023 15:11:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbjATULm (ORCPT ); Fri, 20 Jan 2023 15:11:42 -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 326E7BCE2F; Fri, 20 Jan 2023 12:11:34 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [103.251.226.6]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5E418514; Fri, 20 Jan 2023 21:11:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674245492; bh=t1jVHnyjTLn+8diFp3kpC/3VLmeZuSUcT97KqhG2Zug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I8jBM2xdB6vt7LVScOWAqk5MQQ/p0vWs1BMoGg8Qs//sPGH6b1S5KxFSZhqLHhPOp rMgpZcuuFoIy291iGr/ETckrjUV5/CpHFTaGEwRjXaJ0vCMJ0dT9Sm+rqE/oZ8Fy+t FU2B1cgNj7DOQ27BwBD+H9gFIOwhZY1LOsNowjvA= 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 v6 3/6] staging: vc04_services: bcm2835-camera: Drop include Makefile directive Date: Sat, 21 Jan 2023 01:41:01 +0530 Message-Id: <20230120201104.606876-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120201104.606876-1-umang.jain@ideasonboard.com> References: <20230120201104.606876-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?1755573719838567812?= X-GMAIL-MSGID: =?utf-8?q?1755573719838567812?= Drop the include directive. They can break the build, when 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.