diff mbox series

nvme: fix unused variable warning

Message ID 20210421140436.3882411-1-arnd@kernel.org (mailing list archive)
State Not Applicable
Delegated to: Bjorn Helgaas
Headers show
Series nvme: fix unused variable warning | expand

Commit Message

Arnd Bergmann April 21, 2021, 2:04 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

The function was introduced with a variable that is never referenced:

drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
drivers/pci/quirks.c:312:25: warning: unused variable 'rdev' [-Wunused-variable]

Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pci/quirks.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Krzysztof Wilczyński April 21, 2021, 4:57 p.m. UTC | #1
[+cc Bixuan]

Hi Arnd,

> The function was introduced with a variable that is never referenced:
> 
> drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
> drivers/pci/quirks.c:312:25: warning: unused variable 'rdev' [-Wunused-variable]
> 
> Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path")
[...]

A simialr patch was sent recently, as per:

  https://lore.kernel.org/linux-pci/20210417114258.23640-1-cuibixuan@huawei.com/

Other than that,

Reviewed-by: Krzysztof Wilczyński <kw@linux.com>

Krzysztof
Bjorn Helgaas April 30, 2021, 5:57 p.m. UTC | #2
On Wed, Apr 21, 2021 at 04:04:20PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The function was introduced with a variable that is never referenced:
> 
> drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
> drivers/pci/quirks.c:312:25: warning: unused variable 'rdev' [-Wunused-variable]
> 
> Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path")

I guess this refers to https://lore.kernel.org/linux-nvme/1618458725-17164-1-git-send-email-Prike.Liang@amd.com/

But I don't know what the SHA1 means; I can't find it in linux-next or
my tree.

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/pci/quirks.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 2e24dced699a..c86ede081534 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -309,8 +309,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_8151_0,	quirk_nopci
>  
>  static void quirk_amd_nvme_fixup(struct pci_dev *dev)
>  {
> -	struct pci_dev *rdev;
> -
>  	dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND;
>  	pci_info(dev, "AMD simple suspend opt enabled\n");
>  
> -- 
> 2.29.2
>
Andy Shevchenko April 30, 2021, 6:34 p.m. UTC | #3
On Fri, Apr 30, 2021 at 8:57 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
> On Wed, Apr 21, 2021 at 04:04:20PM +0200, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > The function was introduced with a variable that is never referenced:
> >
> > drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
> > drivers/pci/quirks.c:312:25: warning: unused variable 'rdev' [-Wunused-variable]
> >
> > Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path")
>
> I guess this refers to https://lore.kernel.org/linux-nvme/1618458725-17164-1-git-send-email-Prike.Liang@amd.com/
>
> But I don't know what the SHA1 means; I can't find it in linux-next or
> my tree.

$ git tag --contains 9597624ef606
next-20210416
next-20210419
next-20210420

Something is wrong with your tree.
Bjorn Helgaas April 30, 2021, 7 p.m. UTC | #4
On Fri, Apr 30, 2021 at 09:34:55PM +0300, Andy Shevchenko wrote:
> On Fri, Apr 30, 2021 at 8:57 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
> > On Wed, Apr 21, 2021 at 04:04:20PM +0200, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <arnd@arndb.de>
> > >
> > > The function was introduced with a variable that is never referenced:
> > >
> > > drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
> > > drivers/pci/quirks.c:312:25: warning: unused variable 'rdev' [-Wunused-variable]
> > >
> > > Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path")
> >
> > I guess this refers to https://lore.kernel.org/linux-nvme/1618458725-17164-1-git-send-email-Prike.Liang@amd.com/
> >
> > But I don't know what the SHA1 means; I can't find it in linux-next or
> > my tree.
> 
> $ git tag --contains 9597624ef606
> next-20210416
> next-20210419
> next-20210420
> 
> Something is wrong with your tree.

I think what's wrong is that it doesn't appear in the *current*
linux-next (next-20210430) and I don't have all the old linux-next
objects.

It was in next-20210420, but seems to have been dropped since then:

https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/pci.h?h=next-20210420&id=9597624ef6067bab1500d0273a43d4f90e62e929
Alex Deucher April 30, 2021, 7:23 p.m. UTC | #5
[AMD Public Use]

> -----Original Message-----
> From: Bjorn Helgaas <helgaas@kernel.org>
> Sent: Friday, April 30, 2021 3:01 PM
> To: Andy Shevchenko <andy.shevchenko@gmail.com>
> Cc: Arnd Bergmann <arnd@kernel.org>; Bjorn Helgaas
> <bhelgaas@google.com>; Liang, Prike <Prike.Liang@amd.com>; S-k, Shyam-
> sundar <Shyam-sundar.S-k@amd.com>; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Chaitanya Kulkarni
> <chaitanya.kulkarni@wdc.com>; Arnd Bergmann <arnd@arndb.de>; Lorenzo
> Pieralisi <lorenzo.pieralisi@arm.com>; Kai-Heng Feng
> <kai.heng.feng@canonical.com>; Krzysztof Wilczyński <kw@linux.com>;
> Rajat Jain <rajatja@google.com>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; linux-pci <linux-
> pci@vger.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>
> Subject: Re: [PATCH] nvme: fix unused variable warning
> 
> On Fri, Apr 30, 2021 at 09:34:55PM +0300, Andy Shevchenko wrote:
> > On Fri, Apr 30, 2021 at 8:57 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
> > > On Wed, Apr 21, 2021 at 04:04:20PM +0200, Arnd Bergmann wrote:
> > > > From: Arnd Bergmann <arnd@arndb.de>
> > > >
> > > > The function was introduced with a variable that is never referenced:
> > > >
> > > > drivers/pci/quirks.c: In function 'quirk_amd_nvme_fixup':
> > > > drivers/pci/quirks.c:312:25: warning: unused variable 'rdev'
> > > > [-Wunused-variable]
> > > >
> > > > Fixes: 9597624ef606 ("nvme: put some AMD PCIE downstream NVME
> > > > device to simple suspend/resume path")
> > >
> > > I guess this refers to
> > >
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flo
> > > re.kernel.org%2Flinux-nvme%2F1618458725-17164-1-git-send-email-
> Prike
> > >
> .Liang%40amd.com%2F&amp;data=04%7C01%7Calexander.deucher%40amd.
> com%7
> > >
> C23a1908e8a394d957ce908d90c0a4b06%7C3dd8961fe4884e608e11a82d994e1
> 83d
> > >
> %7C0%7C0%7C637554060633362710%7CUnknown%7CTWFpbGZsb3d8eyJWIj
> oiMC4wLj
> > >
> AwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;
> sdat
> > >
> a=Ztcffnpa8rchwe%2Fb6HuHeRASSlNI7uMwAKZuoH5k6CY%3D&amp;reserv
> ed=0
> > >
> > > But I don't know what the SHA1 means; I can't find it in linux-next
> > > or my tree.
> >
> > $ git tag --contains 9597624ef606
> > next-20210416
> > next-20210419
> > next-20210420
> >
> > Something is wrong with your tree.
> 
> I think what's wrong is that it doesn't appear in the *current* linux-next
> (next-20210430) and I don't have all the old linux-next objects.
> 
> It was in next-20210420, but seems to have been dropped since then:

It was in my tree briefly to facilitate testing, but I since dropped it.

Alex

> 
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.k
> ernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fnext%2Flinux-
> next.git%2Fcommit%2Finclude%2Flinux%2Fpci.h%3Fh%3Dnext-
> 20210420%26id%3D9597624ef6067bab1500d0273a43d4f90e62e929&amp;data
> =04%7C01%7Calexander.deucher%40amd.com%7C23a1908e8a394d957ce908
> d90c0a4b06%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6375540
> 60633362710%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ
> IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=0Rb%2
> F9p8VhmiPu4QP3mEJTUCPe4NNcroFHDhyiYb8h40%3D&amp;reserved=0
diff mbox series

Patch

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2e24dced699a..c86ede081534 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -309,8 +309,6 @@  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_8151_0,	quirk_nopci
 
 static void quirk_amd_nvme_fixup(struct pci_dev *dev)
 {
-	struct pci_dev *rdev;
-
 	dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND;
 	pci_info(dev, "AMD simple suspend opt enabled\n");