[PATCH] staging: rtl8821ae: mark pointer in pci_iounmap as __iomem

[PATCH] staging: rtl8821ae: mark pointer in pci_iounmap as __iomem

[Martin Kepplinger]

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

Signed-off-by: Martin Kepplinger <martink@posteo.de>
---
 drivers/staging/rtl8821ae/pci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8821ae/pci.c b/drivers/staging/rtl8821ae/pci.c
index a562aa6..d934ecb 100644
--- a/drivers/staging/rtl8821ae/pci.c
+++ b/drivers/staging/rtl8821ae/pci.c
@@ -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);
 	}
 
-- 
1.7.10.4

Re: [PATCH] staging: rtl8821ae: mark pointer in pci_iounmap as __iomem

[Greg KH]

On Sat, May 03, 2014 at 05:10:48PM +0200, Martin Kepplinger wrote:
> pci_iounmap is used that way in drivers/net/wireless/rtlwifi and this
> fixes sparse warnings.
> 
> Signed-off-by: Martin Kepplinger <martink@posteo.de>
> ---
>  drivers/staging/rtl8821ae/pci.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8821ae/pci.c b/drivers/staging/rtl8821ae/pci.c
> index a562aa6..d934ecb 100644
> --- a/drivers/staging/rtl8821ae/pci.c
> +++ b/drivers/staging/rtl8821ae/pci.c
> @@ -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

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

[Martin Kepplinger]

Shared addresses can be marked as such.

Signed-off-by: Martin Kepplinger <martink@posteo.de>
---
I guess that's what you meant. Thanks for your feedback!

 drivers/staging/rtl8821ae/wifi.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8821ae/wifi.h b/drivers/staging/rtl8821ae/wifi.h
index 17a9d9f..d162730 100644
--- a/drivers/staging/rtl8821ae/wifi.h
+++ b/drivers/staging/rtl8821ae/wifi.h
@@ -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 */
-- 
1.7.10.4

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

[Greg KH]

On Sun, May 04, 2014 at 02:22:19PM +0200, Martin Kepplinger wrote:
> Shared addresses can be marked as such.
> 
> Signed-off-by: Martin Kepplinger <martink@posteo.de>
> ---
> I guess that's what you meant. Thanks for your feedback!

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