2008-11-02 21:32:57

by Harvey Harrison

Subject: [PATCH] pci: annotate return value of pci_ioremap_bar with __iomem

Acked-by: Arjan van de Ven <[email protected]>
Signed-off-by: Harvey Harrison <[email protected]>
---
include/linux/pci.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9194adf..03b0b8c 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1142,7 +1142,7 @@ static inline void pci_mmcfg_late_init(void) { }
#endif

#ifdef CONFIG_HAS_IOMEM
-static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
+static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
{
/*
* Make sure the BAR is actually a memory resource, not an IO resource
--
1.6.0.3.756.gb776d

2008-11-03 22:33:58

by Jesse Barnes

Subject: Re: [PATCH] pci: annotate return value of pci_ioremap_bar with __iomem

On Sunday, November 2, 2008 1:32 pm Harvey Harrison wrote:
> Acked-by: Arjan van de Ven <[email protected]>
> Signed-off-by: Harvey Harrison <[email protected]>
> ---
> include/linux/pci.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 9194adf..03b0b8c 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1142,7 +1142,7 @@ static inline void pci_mmcfg_late_init(void) { }
> #endif
>
> #ifdef CONFIG_HAS_IOMEM
> -static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
> +static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
> {
> /*
> * Make sure the BAR is actually a memory resource, not an IO resource

Applied to my for-linus branch.

Thanks,
Jesse