From patchwork Wed Jan 18 19:18:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 45433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2517759wrn; Wed, 18 Jan 2023 11:21:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXsby/AEHjmd0xXfi4IZwmRG2tnodlqlxY2LKMIQn/aMmeeHEhqgd87p3y0p5SiRFiVjQAJ5 X-Received: by 2002:a17:907:d401:b0:7c0:c220:a33d with SMTP id vi1-20020a170907d40100b007c0c220a33dmr8914442ejc.9.1674069685742; Wed, 18 Jan 2023 11:21:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674069685; cv=none; d=google.com; s=arc-20160816; b=lCr9ivqWOJCgRaPcngnKfthJOl/UJhhp276ELSItAwO2X8su62EHz4E0MJYvw10URR bJiiqG1QpmEbL/WL542YfidzKwlWa8P7w4pBtu0KD837HTQtgDjuc0Ftz51UKuswzr9v nVv2CnBQs5BjupJtv6smUCaaTxIa6rQ+ePrI+/JHOvofpsPSKv2LfIqgNBEpZkd0uL4j Eqvs9f4KXeRs2frUFtOIeEiAocVZGtPrPDOfpWdyca6tplJmPFOWjK2TtG8OhdDTYMKq nGzrEfpV4jek6oxJWBk4kiU6kxZFv+Xs0BoVWUhqW6J1m5j8dr4D1P+TLXolB2S9db36 k2IA== 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=T5FZQlMkpOKmDy+Djzi9ZGDEC4+KcPPJwigzt3lmqso=; b=R8F4FvDlIWW2bbhvwBHR0ZAE7GI3buoZBanZGQi4SytIczi0sYsFmEiMh93kpCyCG9 f8DoOYduQxyRKfBF6PI7KxEo1MhN38Rlb9gXK9ARHPaGvXs6PKM4F7+DsCOlDDLXt4ZP lFsX4pI0yh+tsKRKmw3a1skocOmI4lXr/nZQkJJRugNElh73Kmp2XsAGwR+uPyN8FOhw kUZFIHecrHmeWsnPAPBtEKDeYgrThOrGLAg1zUrRcmqP3koMKv4o44Bdo4DoXvpx+9yF CFN7fv8RcHMY9LhA4M3ymupRuUJUKJ78VGTHhBxN9KllLNNr9gyON8jQOnYH+7UFve6R Sj3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=K4Soc2vf; 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 ji6-20020a170907980600b00866bd1c81e9si29152347ejc.419.2023.01.18.11.21.01; Wed, 18 Jan 2023 11:21:25 -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=K4Soc2vf; 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 S229637AbjARTT2 (ORCPT + 99 others); Wed, 18 Jan 2023 14:19:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbjARTTM (ORCPT ); Wed, 18 Jan 2023 14:19:12 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D99E35A801; Wed, 18 Jan 2023 11:19:06 -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 493F3158E; Wed, 18 Jan 2023 20:18:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069545; bh=dMHCbrz0mI0q2foYrd80/bZE6sYjFmNjq2hzq9Ngwic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K4Soc2vfgEjDIRa0cFIGwrRsF7klHc/Cs8VV7W/8t5wMCrh5HM0PL52Pn4c5XgVjk kAbrZLEoFU4mxNqutcLr5yDiz7wKBzHv+XUV1QxekrydDFvxsXr+EYuzeTnqGEiRLe eLIejk78/XVeKG9VcuTmv7NAzcLIru6aymRKKAc4= 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 5/6] vc04_services: interface: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:10 +0530 Message-Id: <20230118191811.208552-6-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?1755389294355580728?= X-GMAIL-MSGID: =?utf-8?q?1755389294355580728?= Drop the include directive they can break the build 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 ec3505424718..12da398c6115 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)