[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20100802124429.GA8013@auslistsprd01.us.dell.com>
Date: Mon, 2 Aug 2010 07:44:29 -0500
From: Narendra K <Narendra_K@...l.com>
To: sfr@...b.auug.org.au, jbarnes@...tuousgeek.org
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
jordan_hargrave@...l.com, matt_domsch@...l.com,
charles_rose@...l.com
Subject: Re: linux-next: build warnings after merge of the pci tree
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Monday, August 02, 2010 6:49 AM
> To: Jesse Barnes
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; K,
> Narendra; Hargrave, Jordan
> Subject: linux-next: build warnings after merge of the pci tree
>
> Hi Jesse,
>
> After merging the rr tree, today's linux-next build (powerpc
> ppc64_defconfig) produced lots of these warnings:
>
> drivers/pci/pci.h: In function 'pci_create_firmware_label_files':
> drivers/pci/pci.h:16: warning: 'return' with a value, in function
> returning void
> drivers/pci/pci.h: In function 'pci_remove_firmware_label_files':
> drivers/pci/pci.h:18: warning: 'return' with a value, in function
> returning void
>
> Introduced by commit 911e1c9b05a8e3559a7aa89083930700a0b9e7ee ("PCI:
> export SMBIOS provided firmware instance and label to sysfs").
>
> Please build with and without the CONFIG options your new code depends
> on ... This adds considerably to the build noise.
Jesse,
Sorry, I missed fixing these warnings that come when CONFIG_DMI is
unset. I have fixed them in the below patch. Please consider it for
inclusion.
From: Narendra K <narendra_k@...l.com>
Subject: [PATCH] PCI: Fix warnings when CONFIG_DMI unset
This patch fixes the below warnings introduced by the commit
911e1c9b05a8e3559a7aa89083930700a0b9e7ee ("PCI:
export SMBIOS provided firmware instance and label to sysfs").
drivers/pci/pci.h: In function ‘pci_create_firmware_label_files’:
drivers/pci/pci.h:16: warning: ‘return’ with a value, in function returning void
drivers/pci/pci.h: In function ‘pci_remove_firmware_label_files’:
drivers/pci/pci.h:18: warning: ‘return’ with a value, in function returning void
The warnings are seen because of the below code, doing a retun 0
from the functions 'pci_create_firmware_label_files' and
'pci_remove_firmware_label_files' defined as void.
+#ifndef CONFIG_DMI
+static inline void pci_create_firmware_label_files(struct pci_dev *pdev)
+{ return 0; }
+static inline void pci_remove_firmware_label_files(struct pci_dev *pdev)
+{ return 0; }
Signed-off-by: Narendra K <narendra_k@...l.com>
---
drivers/pci/pci.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index d930338..95186ca 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -13,9 +13,9 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
#ifndef CONFIG_DMI
static inline void pci_create_firmware_label_files(struct pci_dev *pdev)
-{ return 0; }
+{ return; }
static inline void pci_remove_firmware_label_files(struct pci_dev *pdev)
-{ return 0; }
+{ return; }
#else
extern void pci_create_firmware_label_files(struct pci_dev *pdev);
extern void pci_remove_firmware_label_files(struct pci_dev *pdev);
--
1.7.0.1
With regards,
Narendra K
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists