[Acx100-devel] [PATCH 1/5] Fix remaining sparse warnings in pci.c

[Larry F. <Lar...@lw...>]

After commit 3c4f01f, the following warnings remain in pci.c:

  CHECK   pci.c
pci.c:1241:14: warning: incorrect type in assignment (different address spaces)
pci.c:1241:14:    expected void *mem1
pci.c:1241:14:    got void [noderef] <asn:2>*
pci.c:1247:14: warning: incorrect type in assignment (different address spaces)
pci.c:1247:14:    expected void *mem2
pci.c:1247:14:    got void [noderef] <asn:2>*
pci.c:1263:22: warning: incorrect type in assignment (different address spaces)
pci.c:1263:22:    expected void [noderef] <asn:2>*[usertype] iobase
pci.c:1263:22:    got void *mem1
pci.c:1265:23: warning: incorrect type in assignment (different address spaces)
pci.c:1265:23:    expected void [noderef] <asn:2>*[usertype] iobase2
pci.c:1265:23:    got void *mem2
pci.c:1408:27: warning: incorrect type in argument 2 (different address spaces)
pci.c:1408:27:    expected void [noderef] <asn:2>*<noident>
pci.c:1408:27:    got void *mem2
pci.c:1412:27: warning: incorrect type in argument 2 (different address spaces)
pci.c:1412:27:    expected void [noderef] <asn:2>*<noident>
pci.c:1412:27:    got void *mem1
pci.c:1085:1: warning: symbol 'acxpci_probe' was not declared. Should it be static?
pci.c:1453:16: warning: symbol 'acxpci_remove' was not declared. Should it be static?
pci.c:1559:5: warning: symbol 'acxpci_e_suspend' was not declared. Should it be static?
pci.c:1591:5: warning: symbol 'acxpci_e_resume' was not declared. Should it be static?

These are all fixed.

Signed-off-by: Larry Finger <Lar...@lw...>
---
 pci.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pci.c b/pci.c
index ee44ae1..9008267 100644
--- a/pci.c
+++ b/pci.c
@@ -1080,7 +1080,7 @@ acx100pci_ioctl_set_phy_amp_bias(struct net_device *ndev,
  * id	- ptr to the device id entry that matched this device
  */
 #ifdef CONFIG_PCI
-/* static  */
+static
 int __devinit
 acxpci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
@@ -1091,8 +1091,8 @@ acxpci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	unsigned long mem_region2_size;
 	unsigned long phymem1;
 	unsigned long phymem2;
-	void *mem1 = NULL;
-	void *mem2 = NULL;
+	void __iomem *mem1 = NULL;
+	void __iomem *mem2 = NULL;
 	acx_device_t *adev = NULL;
 	const char *chip_name;
 	int result = -EIO;
@@ -1449,7 +1449,7 @@ done:
  *
  * pdev - ptr to PCI device structure containing info about pci configuration
  */
-/* static */
+static
 void __devexit acxpci_remove(struct pci_dev *pdev)
 {
 	struct ieee80211_hw *hw = (struct ieee80211_hw *)pci_get_drvdata(pdev);
@@ -1555,7 +1555,7 @@ void __devexit acxpci_remove(struct pci_dev *pdev)
 ** TODO: PM code needs to be fixed / debugged / tested.
 */
 #ifdef CONFIG_PM
-/* static  */
+static
 int acxpci_e_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
@@ -1587,7 +1587,7 @@ int acxpci_e_suspend(struct pci_dev *pdev, pm_message_t state)
 	return OK;
 }
 
-/* static */
+static
 int acxpci_e_resume(struct pci_dev *pdev)
 {
 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-- 
1.7.7