From patchwork Fri Jan 20 20:11: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: 46615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp404321wrn; Fri, 20 Jan 2023 12:12:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXuCHEynvV+bM4lYlQr1GtIRAOZK0VcbnXV5lzbS1BL89n+V4Yysseu5zEIAub5G/frsi5T2 X-Received: by 2002:a17:906:1851:b0:7b8:882d:43ef with SMTP id w17-20020a170906185100b007b8882d43efmr21529687eje.0.1674245564085; Fri, 20 Jan 2023 12:12:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674245564; cv=none; d=google.com; s=arc-20160816; b=r8BM2i8eM5p/7M9//uEXkxkuAUkoIx7hoakeD7nwafMw9p4k8GwphPIJMrcd4BQYH7 ei+rNPAsfQCwyqoADEyI7mRdyJXdGLOWGwxP1b1ao24wb9jd3vx1ZeNSS1RwY/16+0QE mw4QRfB6/JZyLJXmMa1fH8ZEAf8BKLqdoRotCgffb+rd8y9PMEf2OSTcb8xUsFmvXAZX LYs9tN1IusAzXVLhfcfN5NPBPGbgZTuv4I+r8O+PCqlOhoADiEgWoWMny1Xl3cfLnOcd 5KYavRJZOdbgrEnjwJp0c8Gac+o9163qEou0D31yWWhdXy7I0TZkEEoxuQnw02cTrNyq 7ECA== 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=V0jz9ofl9/dRXk+ECVDzls6hUzZ/WPqcFsky5wbswNs=; b=sAOcvMJKUX5ixLBFm7uSC+QBO4ESteg4vTfMj3XxlrCDvVQqoj2sJz6g6Wx1dancqR MZ8/Y2VbGWlTmcq5CRPJ5IzAOh7ueQ5arLpYi10xJdpTmYUWhdTV78ocJefEB/u/h34V Mx0dzn5iiZ0d/DGxZ5Cg+HCbX6HRX5bvTfFNsvIvxEHw8ImwrLLU1n/1nTVSnwVGFymF Ehqkkd17Q3feXQL8U4nDZo+Kvph/cS/ymiCh00GhM/P2/x0iXjqJ2hrZUehg4ia64FaY LPIN72r+Yr4/7jOaHU19Vrjnn3YVL6s1JU36/zZZFObOvYBKQ+NeOGYgZX88tj0KoI50 sZRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="v/8dn6xJ"; 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 xj1-20020a170906db0100b007c1753251a4si19587774ejb.928.2023.01.20.12.12.20; Fri, 20 Jan 2023 12:12:44 -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="v/8dn6xJ"; 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 S230041AbjATULh (ORCPT + 99 others); Fri, 20 Jan 2023 15:11:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbjATULd (ORCPT ); Fri, 20 Jan 2023 15:11:33 -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 56A75BC8A3; Fri, 20 Jan 2023 12:11:29 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [103.251.226.6]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E0C23104C; Fri, 20 Jan 2023 21:11:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674245487; bh=Zngsaz8GwwntFvLzEgh5Y8P+7IVbo+ADRxKcwraGzEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v/8dn6xJI/Mzj+iQlZxdBMqv4b3EKDKQ1Y1zkq6G00D0eDkmyAZy9LaTX8wHhPLA6 DZ188CMIyxxRKruhcSHQplKjYu11VHSquypetOGeNQVXbyAfAaqowfS/93AJ27RH6N nwUUQhrxeypcnK4EROcEBvLdrYKNNJ/UfBCJEdCA= 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 2/6] staging: vc04_services: bcm2835-audio: Drop include Makefile directive Date: Sat, 21 Jan 2023 01:41:00 +0530 Message-Id: <20230120201104.606876-3-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?1755573716630369274?= X-GMAIL-MSGID: =?utf-8?q?1755573716630369274?= 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.h instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 -- drivers/staging/vc04_services/bcm2835-audio/bcm2835.h | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile index fc7ac6112a3e..01ceebdf88e7 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/Makefile +++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile @@ -1,5 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o - -ccflags-y += -I $(srctree)/$(src)/../include diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h index 38b7451d77b2..0a81383c475a 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -6,11 +6,12 @@ #include #include -#include #include #include #include +#include "../include/linux/raspberrypi/vchiq.h" + #define MAX_SUBSTREAMS (8) #define AVAIL_SUBSTREAMS_MASK (0xff)