From patchwork Wed Jan 18 19:18:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 45430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2517286wrn; Wed, 18 Jan 2023 11:20:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrHCAOLPaKbuEby/WTpdQvwOAGFUJQP1DR5xsSZ9ScNxAnZ+gKE+XRFBMkIlOQ+LwhA7MC X-Received: by 2002:a17:907:8b92:b0:877:6a03:9aa4 with SMTP id tb18-20020a1709078b9200b008776a039aa4mr802346ejc.72.1674069624857; Wed, 18 Jan 2023 11:20:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674069624; cv=none; d=google.com; s=arc-20160816; b=Whhs8e5iYPt5n8G8UZVlPnVbf9cl1RJpnzDRtQKCq6AWbmuUqUnOmaaAmQprNX2akM xqfQ65Pw8F3kNh9DG29WQq1Bd6DVH6qWib53N3Qm3LiSPAaVFJA+LnK+3AH26MrhYJgW yHfMDn2l7ND8Op/Vx0VuF+UsgzP/nsOzJ4QvWe3l+T6PFYefkuptIM73tDLoa1lcW84g PPQZdFdhjJgx71L75tEt2cn3+MsCJ+PKb7DLBooGt/1/YVGty6kZmZ0SQpH2Dl/BMiTD jy1iQpQIf3BWkzOkYoXZUpue3MjB7AmhoTOb75Sxd3uX5l+Ww+Zv9ogsObuqMdzUBjn7 3M6w== 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=Gda5stTJH+dR3+ZB+Ctlo5KO+bZFsI1S+HWApyH0WlM=; b=zfn4y0/NNvxvJrTGz6L58zKqaTdj8n6Oa9OPhLZ9RvT5jQ4ApVyvNGnsOBC4oSQ4uP FRQLFS8n7agUfKhbrvYutEsMBr6pFuN7ZuWK61aOtA22fQmpNHeteJNqbQ/bh7PvC0gn cCeG4J7pXaSkEio4deYaRcgAk7zTOFgsVqXQv/F9WvpsiQJOwSMveZIDM5ARJFNcO6pF pzCieZ+4j3mlpIPelFifR5nlnPo5xcpUCLu0AQraamTWlCsc6MKJyAWdrB1yMp5Gt2SA n+oTW+13X7zhy+wPETzC1yOmHF83NAa5VhE74rsKj3JhOqPj3CcRhnj0cIzUDIQuYQJa 1NlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=nAJ9Y52A; 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 xf7-20020a17090731c700b007825337afeesi38438196ejb.273.2023.01.18.11.20.01; Wed, 18 Jan 2023 11:20:24 -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=nAJ9Y52A; 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 S230043AbjARTS6 (ORCPT + 99 others); Wed, 18 Jan 2023 14:18:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230110AbjARTSq (ORCPT ); Wed, 18 Jan 2023 14:18:46 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6007A53FA2; Wed, 18 Jan 2023 11:18:43 -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 839E51056; Wed, 18 Jan 2023 20:18:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069522; bh=psqCt6za/rWwlS8mx3H67DzrDFITmHUqUzosgzjCokY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAJ9Y52AiPrqGZhBONG9RqjapRQzUKzvOGwsc8HSlPY+buefXW3uFeDrj9roboLs2 V9BKgWtND9DZQpgd56Kt32KWzQnt00jZaEbObbg8DdYjwLEdXZ95XmYvCzFRlfI/KK 2/7pe96HfLZtF+3uvSMFnqupGZUlRnSR1AEUBzQI= 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 2/6] vc04_services: bcm2835-audio: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:07 +0530 Message-Id: <20230118191811.208552-3-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?1755389231452389805?= X-GMAIL-MSGID: =?utf-8?q?1755389231452389805?= Drop the include directive they can break the build 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)