From patchwork Fri Jan 20 20:11:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 46619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp404664wrn; Fri, 20 Jan 2023 12:13:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXvyk23py67ivA6RPBfDQuVOEshA8gjNZUl6KhyX2B5Ue4VOm7LXrxH89r28ut/ejjAbbPEK X-Received: by 2002:a17:906:af13:b0:86d:f370:19ab with SMTP id lx19-20020a170906af1300b0086df37019abmr16078539ejb.5.1674245609623; Fri, 20 Jan 2023 12:13:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245609; cv=none; d=google.com; s=arc-20160816; b=uQnQzMKaB3NCXQDmQdwMkblpKAviQ/KiHtABZOQnShQMyegnOz3BpVC+FBVzeTCzdq fGkYzYXTExjNVluvE9GSWEyCfunxly0iR5LVrUpD81MRwaK7GnHxAvEpejJr7CU40PjQ 3eeHEf09YhiwHYUvaqF6u7Hi/GQTRC0FQNiEjQpIQznGLfi3JVxfT217Fptx0tAqWr4D OaE39pHEh0QCsN0BC+ERwc9oEffBtl79OuUGPNc+mHvjZzse2mGyJtJ0b5ekiH4BfxC9 yg2NQtWAYAsu5J6tp8Jwe1MWsWY4thztYF9d23xbnISDG6N407bbyZTKxfSuGMKZ/vdu d8aQ== 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=keHVe57regB2DvpdAGY1ME0EdLRFf9BSYPs/KCZ6y78=; b=ZuoujMSHfS6DDhwL8Dfjt+BdiJYQKgf2n5UrjfV9YzWW1cu5JPU33BX5Tk34oRtJlq z+fLbKL/gylonv00o+14sZi0kxBa7gzSAwizNU9gyumFwfoysngU0ua6p6ZlDS12VW+O ss9qXuoDbekeN+Qx9ho+uEOW2E9MQUhgLLi1aLnl9JnkUZjzr4BzzTIPAmJhYOt2kB0j yuiMjAGqma51xKqOzl3wpD6fO+1FEdq8gyHaNothMek2CiEAXHWo29+gk1SdJuBARI9K OhejgG4rRbR7zRgzbyl5/MjI+KM/SeLiZgQ+IJJFv2uCJCOtxANwAcdEj3FmMz1Kx/63 N4hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=WVYCcrYJ; 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 he35-20020a1709073da300b007ae814af66bsi16539921ejc.389.2023.01.20.12.13.06; Fri, 20 Jan 2023 12:13:29 -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=WVYCcrYJ; 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 S229992AbjATUMD (ORCPT + 99 others); Fri, 20 Jan 2023 15:12:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230057AbjATUMB (ORCPT ); Fri, 20 Jan 2023 15:12:01 -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 E607AC41D0; Fri, 20 Jan 2023 12:11:45 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [103.251.226.6]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 310F9104C; Fri, 20 Jan 2023 21:11:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674245504; bh=foOzqx8i0GwXFtcfRogUR42Bcu3qNaPa5Xq+4eZ5fIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVYCcrYJavyX4YwixmDS7AXxUgXGBClSZQqMX/C0QO2IXVtVsXM9vExqz6yAwIs7c rl0//1OQYdbc5k1HreEnw2drUV/atpOw2/FObrDjsAz7n1OJQuYFedetR6elpgFsxJ 07kKCZ27c0C1qCN9kZzcvJlbg8dZT9u6b/5ALp84= 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 5/6] staging: vc04_services: interface: Drop include Makefile directive Date: Sat, 21 Jan 2023 01:41:03 +0530 Message-Id: <20230120201104.606876-6-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?1755573764277528063?= X-GMAIL-MSGID: =?utf-8?q?1755573764277528063?= Drop the include directive. They can break the build, when one only wants to build a subdirectory. Replace with "../" for the includes, in the interface/ files instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/Makefile | 2 -- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index 1fd191e2e2a5..44794bdf6173 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -15,5 +15,3 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/ -ccflags-y += -I $(srctree)/$(src)/include - diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index 3c198eb1c77a..ec1a3caefaea 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -10,8 +10,8 @@ #include #include #include -#include +#include "../../include/linux/raspberrypi/vchiq.h" #include "vchiq_cfg.h" /* Do this so that we can test-build the code on non-rpi systems */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h index 96f50beace44..17550831f86c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h @@ -5,7 +5,8 @@ #define VCHIQ_IOCTLS_H #include -#include + +#include "../../include/linux/raspberrypi/vchiq.h" #define VCHIQ_IOC_MAGIC 0xc4 #define VCHIQ_INVALID_HANDLE (~0)