From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0ED0E6EB46; Wed, 3 Apr 2024 08:29:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712132994; cv=none; b=Hz66Ka/o23Aqq8F3NU1fbAO1IU0YvpowjepipqSF0zet6/Gzus9XwCqij8Tpha9KUvdt1TSmrfWj/fRijzMHKBFfrAO/AkJunVRSA69e+fVjvEW0/p2E54duaC3bR6XqIlRwQP2pt8cvlFoTQLnfDf2Zu+Ni60HqpEayp2m2T78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712132994; c=relaxed/simple; bh=V7hshp8YwdyzWcNiPKdPqCT3ijnrNapazFii9glTbP4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=V2KJiybwMFC1opsejq3nEQwITxws0VYhPBdw40wXUHI0W1dDzPWXuXPrG7nbZ/dMhKQgX7lP3Ha6/RV8gmfa7GS2MSOb9HK9YnH+Tzsbok/vV+QEW6ZZdE5jat5WqqWOxA64OHACSqT5a3CwOsJYXZy/ufGH+WJvhnu9yFiifJc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lgxLatbc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lgxLatbc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E684CC433C7; Wed, 3 Apr 2024 08:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712132993; bh=V7hshp8YwdyzWcNiPKdPqCT3ijnrNapazFii9glTbP4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=lgxLatbcHdnbPBulu02mDhoeYzX6ORMNeRanf8a3GGozNvQJV7TIBMp6XJgK39DtT CpkwECroNXIPfB7GbvZ0ssBYr1ynP1dZa9rzNI/L3hCiPlnqtDLj0g4JCzLxcNUE00 2qq5e85qykfWkuKkep888hWyGo8gRrVYZNS7/fl4pEd98rUA72R8LYYeIwg3Km45Zb I5/RedOCMSyGm4cI2fjEVPrONG50ELSblLPZIYWPWBOKsQkz94ndCWgUE4Ne+wBqyf YMiNvv8SctFeIn7W8/IzQ45F2L0wILzHt7S+mLjvJ/TC5AKKeM2SvoOrTHuIgK3HpA 4oH8rfwBirifQ== Message-ID: <53e6b7af-1db3-439a-8085-9f0a3be1c3b6@kernel.org> Date: Wed, 3 Apr 2024 17:29:50 +0900 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 30/34] sata: mv: drop unnecessary #ifdef checks To: Arnd Bergmann , linux-kernel@vger.kernel.org, Niklas Cassel , Saeed Bishara Cc: Arnd Bergmann , Ma Ke , =?UTF-8?Q?Uwe_Kleine-K=C3=B6nig?= , Sergey Shtylyov , Christophe JAILLET , Jeff Garzik , linux-ide@vger.kernel.org References: <20240403080702.3509288-1-arnd@kernel.org> <20240403080702.3509288-31-arnd@kernel.org> Content-Language: en-US From: Damien Le Moal Organization: Western Digital Research In-Reply-To: <20240403080702.3509288-31-arnd@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/3/24 17:06, Arnd Bergmann wrote: > From: Arnd Bergmann > > Building with W=1 shows a warning for an unused variable when CONFIG_PCI > is diabled: s/diabled/disabled > drivers/ata/sata_mv.c:790:35: error: unused variable 'mv_pci_tbl' [-Werror,-Wunused-const-variable] > static const struct pci_device_id mv_pci_tbl[] = { > > Move the table into the same block that containsn the pci_driver > definition. s/containsn/contains But no need to resend, I will fix that when applying. Thanks ! > > Fixes: 7bb3c5290ca0 ("sata_mv: Remove PCI dependency") > Signed-off-by: Arnd Bergmann > --- > drivers/ata/sata_mv.c | 64 +++++++++++++++++++++---------------------- > 1 file changed, 32 insertions(+), 32 deletions(-) > > diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c > index e82786c63fbd..697063890f5d 100644 > --- a/drivers/ata/sata_mv.c > +++ b/drivers/ata/sata_mv.c > @@ -787,37 +787,6 @@ static const struct ata_port_info mv_port_info[] = { > }, > }; > > -static const struct pci_device_id mv_pci_tbl[] = { > - { PCI_VDEVICE(MARVELL, 0x5040), chip_504x }, > - { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, > - { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, > - { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, > - /* RocketRAID 1720/174x have different identifiers */ > - { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, > - { PCI_VDEVICE(TTI, 0x1740), chip_6042 }, > - { PCI_VDEVICE(TTI, 0x1742), chip_6042 }, > - > - { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, > - { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, > - { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 }, > - { PCI_VDEVICE(MARVELL, 0x6080), chip_608x }, > - { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, > - > - { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, > - > - /* Adaptec 1430SA */ > - { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 }, > - > - /* Marvell 7042 support */ > - { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 }, > - > - /* Highpoint RocketRAID PCIe series */ > - { PCI_VDEVICE(TTI, 0x2300), chip_7042 }, > - { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, > - > - { } /* terminate list */ > -}; > - > static const struct mv_hw_ops mv5xxx_ops = { > .phy_errata = mv5_phy_errata, > .enable_leds = mv5_enable_leds, > @@ -4303,6 +4272,37 @@ static int mv_pci_init_one(struct pci_dev *pdev, > static int mv_pci_device_resume(struct pci_dev *pdev); > #endif > > +static const struct pci_device_id mv_pci_tbl[] = { > + { PCI_VDEVICE(MARVELL, 0x5040), chip_504x }, > + { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, > + { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, > + { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, > + /* RocketRAID 1720/174x have different identifiers */ > + { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, > + { PCI_VDEVICE(TTI, 0x1740), chip_6042 }, > + { PCI_VDEVICE(TTI, 0x1742), chip_6042 }, > + > + { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, > + { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, > + { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 }, > + { PCI_VDEVICE(MARVELL, 0x6080), chip_608x }, > + { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, > + > + { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, > + > + /* Adaptec 1430SA */ > + { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 }, > + > + /* Marvell 7042 support */ > + { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 }, > + > + /* Highpoint RocketRAID PCIe series */ > + { PCI_VDEVICE(TTI, 0x2300), chip_7042 }, > + { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, > + > + { } /* terminate list */ > +}; > + > > static struct pci_driver mv_pci_driver = { > .name = DRV_NAME, > @@ -4315,6 +4315,7 @@ static struct pci_driver mv_pci_driver = { > #endif > > }; > +MODULE_DEVICE_TABLE(pci, mv_pci_tbl); > > /** > * mv_print_info - Dump key info to kernel log for perusal. > @@ -4487,7 +4488,6 @@ static void __exit mv_exit(void) > MODULE_AUTHOR("Brett Russ"); > MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers"); > MODULE_LICENSE("GPL v2"); > -MODULE_DEVICE_TABLE(pci, mv_pci_tbl); > MODULE_VERSION(DRV_VERSION); > MODULE_ALIAS("platform:" DRV_NAME); > -- Damien Le Moal Western Digital Research