linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tlan: avoid unused label with PCI=n
@ 2016-10-10 12:41 Arnd Bergmann
  2016-10-13 13:56 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2016-10-10 12:41 UTC (permalink / raw)
  To: Samuel Chessman
  Cc: Arnd Bergmann, David S. Miller, Mugunthan V N, Ivan Vecera,
	Antonio Quartulli, Florian Westphal, netdev, linux-kernel

While build testing with randconfig on x86, I ran into this warning
that appears to have been around forever

drivers/net/ethernet/ti/tlan.c: In function ‘tlan_probe1’:
drivers/net/ethernet/ti/tlan.c:614:1: error: label ‘err_out’ defined but not used [-Werror=unused-label]

This can be trivially avoided by just moving the label into the
existing #ifdef.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ethernet/ti/tlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index ece0ea0f6b38..6c7ec1ddd475 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -610,8 +610,8 @@ static int tlan_probe1(struct pci_dev *pdev, long ioaddr, int irq, int rev,
 #ifdef CONFIG_PCI
 	if (pdev)
 		pci_release_regions(pdev);
-#endif
 err_out:
+#endif
 	if (pdev)
 		pci_disable_device(pdev);
 	return rc;
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] tlan: avoid unused label with PCI=n
  2016-10-10 12:41 [PATCH] tlan: avoid unused label with PCI=n Arnd Bergmann
@ 2016-10-13 13:56 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-10-13 13:56 UTC (permalink / raw)
  To: arnd; +Cc: chessman, mugunthanvnm, ivecera, a, fw, netdev, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 10 Oct 2016 14:41:10 +0200

> While build testing with randconfig on x86, I ran into this warning
> that appears to have been around forever
> 
> drivers/net/ethernet/ti/tlan.c: In function ‘tlan_probe1’:
> drivers/net/ethernet/ti/tlan.c:614:1: error: label ‘err_out’ defined but not used [-Werror=unused-label]
> 
> This can be trivially avoided by just moving the label into the
> existing #ifdef.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied, thanks Arnd.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-10-13 13:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-10 12:41 [PATCH] tlan: avoid unused label with PCI=n Arnd Bergmann
2016-10-13 13:56 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).