From patchwork Wed Jan 18 19:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 45434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2517996wrn; Wed, 18 Jan 2023 11:21:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXsPh5lMb2omplB9QCCRKyjaP4FRzhFXJGORNCPLfzDm7k6mzzKxS7oIXOfAeAZrtTsUJtM/ X-Received: by 2002:a17:906:7156:b0:86d:f880:5195 with SMTP id z22-20020a170906715600b0086df8805195mr8234091ejj.56.1674069717033; Wed, 18 Jan 2023 11:21:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674069717; cv=none; d=google.com; s=arc-20160816; b=oWzDHLurCb+Z/B/0AHcTLcivEndbDJlWxvt0rfGhCzd9qk+a+CNi9QQw0vbSlQlYGv 2N378K5/c2IRvxZZCCsH36SDUdLi63ldtOt7izLC5+PbTI2IUGgDKbPsHAJBU8ScSHEP 7jjS+NSBMUTZWipPcE+iU6Xo2/zr932CD1y317jP11EsdyKp1NbwA5Pl4eivX643357h orjwQkQtdYnflV0TO4ZgtWJkJ7teofmznieQ8Z341Kfp3FkcIEigN6axc6uf5inDSz5J QnSfUekze1aMz652fgw5gVk4IpGdGSJ0GUMLt+0Gn0u+on3dL5WJGYl+pGTnaOqQmI8o BDoQ== 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=4Bz0YRGhyGJa4YD0UWvUkMcNtZxYYi6Y/fX6FR063HA=; b=AUHM9fmdy9gadlT+gI6LSXXsTECL2ATKSb9Hts/a3gco1SLOTDtstm9oCVNUPeneqG hsp83659Fs/czpoQUJAQWsp+5hwor/t4Z2OZV0bOlXGxwYlanVvxxNWv7O1JuKQ+SMYP 7y03lvqLV3hBPrpRQCjx/O4JbLxGl88G1z9ORDYciwGpf3xa6D63O0Ysx1YbbxkuUzN8 xR7z/4kdBBK2CCqxXOFz0aviPkXps0LZfeyFKNuQ/C+fLyVHF/MAr+PuBDKyzTsj3oWF eiLNoyigy7VFeKPs/v156gg2gCh7958xKpTG4n8ef4nqACECjMvDudu+uZY3KdKy27pZ 40bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=Pz1CU3Pq; 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 dd11-20020a1709069b8b00b008775fc7095esi2533738ejc.899.2023.01.18.11.21.33; Wed, 18 Jan 2023 11:21:57 -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=Pz1CU3Pq; 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 S230003AbjARTSo (ORCPT + 99 others); Wed, 18 Jan 2023 14:18:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229997AbjARTSh (ORCPT ); Wed, 18 Jan 2023 14:18:37 -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 47B7E53B02; Wed, 18 Jan 2023 11:18:36 -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 E3293158E; Wed, 18 Jan 2023 20:18:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069514; bh=BwKY49SsGRfLKtwynm1ZtOjuQBk6X8yUktR1hkyodis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pz1CU3PqffAhIFYxIVlbenqt63EbVRewfW9KV/04OnuRZ8K8WgXJvU+xPJv4QnYsy LU5nnCcv5puDeeiru70KANkamo1qvsg6DbQn/hvC7i8czU4zDg7LM5Ll1t3ECYtbbQ Nk7atFrlBSX6ChjNugXvVVRrTh13l42obt6yIEwY= 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 1/6] staging: vc04_services: Drop __VCCOREVER__ remnants Date: Thu, 19 Jan 2023 00:48:06 +0530 Message-Id: <20230118191811.208552-2-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?1755389327602226936?= X-GMAIL-MSGID: =?utf-8?q?1755389327602226936?= Commit 8ba5f91bab63("staging: vc04_services: remove __VCCOREVER__") was meant to remove all of __VCCOREVER__ definitions but missed to remove a few. Hence, drop them now. Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 +- drivers/staging/vc04_services/bcm2835-camera/Makefile | 3 +-- drivers/staging/vc04_services/vchiq-mmal/Makefile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile index d59fe4dde615..fc7ac6112a3e 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/Makefile +++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile @@ -2,4 +2,4 @@ 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 -D__VCCOREVER__=0x04000000 +ccflags-y += -I $(srctree)/$(src)/../include diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 3a76d6ade428..3494c82b271a 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -7,5 +7,4 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o ccflags-y += \ -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../vchiq-mmal/ \ - -D__VCCOREVER__=0x04000000 + -I $(srctree)/$(src)/../vchiq-mmal/ diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile index b2a830f48acc..c7d3b06e17ce 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile @@ -5,5 +5,4 @@ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o ccflags-y += \ -I$(srctree)/$(src)/.. \ - -I$(srctree)/$(src)/../include \ - -D__VCCOREVER__=0x04000000 + -I$(srctree)/$(src)/../include