From patchwork Tue Jul 7 06:47:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11647823 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB21B13B4 for ; Tue, 7 Jul 2020 06:48:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A105920675 for ; Tue, 7 Jul 2020 06:48:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="swnpqbB8"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RcxeUoQC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A105920675 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=u6vk7kpou1Fhw65j0sIH8l2dwqdKEw1//6JPS/oV4qg=; b=swnpqbB8Y7L5XeTK1WUNtI7yY HGgA7mJhfrjAd3yMScJblRZCYwkvU7lqzQ1ISZEhgwQ5Q9xH1nZevnSpYn0yTBVW6fJp2RjvjBYGN 05aProysRnGEU4umSUF455pSXrv7xAgjhtpnvAxFVvmvsYlJOYMSmYSHn52TxF0V0Bx4Y395btwfi f6cqtyDMkyNpjPSX87vKJnn8arV9BKCqOR766bdAl+J5ynYcSgHgYqrFB2skDMyYbdhYswHmyaKH1 2RMLW0xDdHsMF5oasSBaP1mRnOL1zh6nQcCcKrpZGGxGDTGNEZhK1tnc6Z4bw2RDqHAMU43E6n39t 1be/D538A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jshNk-0006nG-3b; Tue, 07 Jul 2020 06:47:08 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jshNh-0006mM-3a for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2020 06:47:06 +0000 Received: by mail-wr1-x435.google.com with SMTP id r12so43841968wrj.13 for ; Mon, 06 Jul 2020 23:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=pAUaHQGnD3+ZIQQ0Oy5xYapqsREaQJS2n89f+4B15KI=; b=RcxeUoQCIgWgnkUSLjmg4dR9sste/vAvBkd1Op5/YaTwssHXSeVR5xiejR22wncB2a 8Uw9tPYNBl5p5Kj4Hkq+/DMOXE1y0AdFAr2ozkV3c1eIApLwPoQwwdqY2rGztBkf6GJb P92aouXq2/SYzxIFHEBXJt6ATRyUuAlJWmhbQfznUC/Qx2FTiAu7vCiPZOCi7a+cwPCo dXL8QeCYXg9L+YfGSYnn1q0C5vEMfitOXAoz9a/6/ZhJ5JjD45/YhsJNQw+w6kGMkrrd focvXNgM6OYhXUegweM2C+oISvCa5HGv+OTgKeAb58vB71CIHXjx2NUEMgyjDPO7nNYm Ribw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=pAUaHQGnD3+ZIQQ0Oy5xYapqsREaQJS2n89f+4B15KI=; b=YNufF8Xu9Ebc8PIVOSyZzZF5iy3JxO6cfTLV3sSw9AsdbA3D1n38Th4EiVYmHTH+DV UHl10MSA1D0fdPdZRXwtzyJPIx7/rCT2lKHo26i9YcaW2gXKXFOWsCtDQIBbPVYz+QnX 4cj7iRbjBs7V7Pr2BUc3G1cigGvwR/gLgkifu6/N8QgcdqRkPYDFj+98Ncc2hgIS1MBd shkggattG50DLKIOK1W7MnnmUtAdQwsIVwaOexI8FV5Wff+tro44yiqhS9lnxyFsZ1jP WsPHvDgg1Fr/cUB+Tr4a96yRqqY/sphrVWJAJuNOprI+1lZb9bn2XDLRu+9DbW8dc8o/ F1/g== X-Gm-Message-State: AOAM533nz++whGk0nK+1fBr/fv3zggeE21forGgKj7/jW+FwoNDyqzzr k1P0jFrHm7MFFGwM3oGFlt1Jewx0XvE= X-Google-Smtp-Source: ABdhPJxYZ9YrCD0dzxdBWyfKxvHKA5xY3Xb6yXZlFWOzNnNc4LwDgOikVdB+P6BMLX5ckmH/XmThTw== X-Received: by 2002:a5d:540d:: with SMTP id g13mr48558121wrv.380.1594104424095; Mon, 06 Jul 2020 23:47:04 -0700 (PDT) Received: from dell ([2.27.35.206]) by smtp.gmail.com with ESMTPSA id d2sm27489648wrs.95.2020.07.06.23.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 23:47:03 -0700 (PDT) Date: Tue, 7 Jul 2020 07:47:01 +0100 From: Lee Jones To: ulf.hansson@linaro.org Subject: [PATCH v2 15/15] mmc: host: sdhci-iproc: Do not define 'struct acpi_device_id' when !CONFIG_ACPI Message-ID: <20200707064701.GC3500@dell> References: <20200701124702.908713-1-lee.jones@linaro.org> <20200701124702.908713-16-lee.jones@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200701124702.908713-16-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200707_024705_474991_934E9AD7 X-CRM114-Status: GOOD ( 10.52 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:435 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Branden , Ray Jui , linux-kernel@vger.kernel.org, Adrian Hunter , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Since ACPI_PTR() is used to NULLify the value when !CONFIG_ACPI, 'struct sdhci_iproc_acpi_ids' becomes defined but unused. Fixes the following W=1 kernel build warning: mmc/host/sdhci-iproc.c:297:36: warning: ‘sdhci_iproc_acpi_ids’ defined but not used [-Wunused-const-variable=] Cc: Adrian Hunter Cc: Ray Jui Cc: Scott Branden Cc: bcm-kernel-feedback-list@broadcom.com Signed-off-by: Lee Jones Acked-by: Scott Branden diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 225603148d7de..e2d8dfe90077e 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -294,12 +294,14 @@ static const struct of_device_id sdhci_iproc_of_match[] = { }; MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match); +#ifdef CONFIG_ACPI static const struct acpi_device_id sdhci_iproc_acpi_ids[] = { { .id = "BRCM5871", .driver_data = (kernel_ulong_t)&iproc_cygnus_data }, { .id = "BRCM5872", .driver_data = (kernel_ulong_t)&iproc_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(acpi, sdhci_iproc_acpi_ids); +#endif static int sdhci_iproc_probe(struct platform_device *pdev) {