Skip to contentSkip to conversation

staging: rtl8821ae: mark pointer in pci_iounmap as __iomem

PATCH In review Martin Kepplinger 2 participants 4 messages May 3, 2014 – May 23, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8821ae: mark pointer in pci_iounmap as __iomem

pci_iounmap is used that way in drivers/net/wireless/rtlwifi and this fixes sparse warnings.

---
 drivers/staging/rtl8821ae/pci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8821ae/pci.c +2 -2
index a562aa6..d934ecb 100644
@@ -2416,7 +2416,7 @@ fail3:
 	ieee80211_free_hw(hw);
 
 	if (rtlpriv->io.pci_mem_start != 0)
-		pci_iounmap(pdev, (void *)rtlpriv->io.pci_mem_start);
+		pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 
 fail2:
 	pci_release_regions(pdev);
@@ -2479,7 +2479,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
 
 	list_del(&rtlpriv->list);
 	if (rtlpriv->io.pci_mem_start != 0) {
-		pci_iounmap(pdev, (void *)rtlpriv->io.pci_mem_start);
+		pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 		pci_release_regions(pdev);
 	}
 
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw
Quoted 13 lines · Martin Kepplinger

pci_iounmap is used that way in drivers/net/wireless/rtlwifi and this fixes sparse warnings.

---
 drivers/staging/rtl8821ae/pci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8821ae/pci.c +0 -0
index a562aa6..d934ecb 100644

drivers/staging/rtl8821ae/pci.c fail3: · line 2419

Quoted 5 lines
drivers/staging/rtl8821ae/pci.c +1 -1
@@ -2416,7 +2416,7 @@ fail3:
 	ieee80211_free_hw(hw);
 
 	if (rtlpriv->io.pci_mem_start != 0)
-		pci_iounmap(pdev, (void *)rtlpriv->io.pci_mem_start);
+		pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);

Shouldn't pci_mem_start be a __iomem pointer instead?

thanks,

greg k-h

#2 lore raw

PATCH v2 1/1 staging: rtl8821ae: mark pci_mem_start (and _end) as __iomem

Shared addresses can be marked as such.

---
I guess that's what you meant. Thanks for your feedback!

 drivers/staging/rtl8821ae/wifi.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8821ae/wifi.h +2 -2
index 17a9d9f..d162730 100644
@@ -1086,8 +1086,8 @@ struct rtl_io {
 	struct device *dev;
 
 	/*PCI MEM map */
-	unsigned long pci_mem_end;	/*shared mem end        */
-	unsigned long pci_mem_start;	/*shared mem start */
+	unsigned long __iomem pci_mem_end;	/*shared mem end   */
+	unsigned long __iomem pci_mem_start;	/*shared mem start */
 
 	/*PCI IO map */
 	unsigned long pci_base_addr;	/*device I/O address */
Signature · 1 line
1.7.10.4
maintainer
#3 lore raw

Re: [PATCH v2] staging: rtl8821ae: mark pci_mem_start (and _end) as __iomem

Quoted 5 lines · Martin Kepplinger

Shared addresses can be marked as such.

---
I guess that's what you meant. Thanks for your feedback!

Yes, that is correct, but someone beat you to this patch, sorry :(