Re: [PATCH -next] m68k: fix return value check in mcf_pci_init()

[Greg Ungerer]

Hi Wei,

On 18/04/18 23:57, Wei Yongjun wrote:
> In case of error, the function ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be
> replaced with NULL test.
> 
> Fixes: bf114d773167 ("m68k: force use of __raw_read/__raw_write address to be 
> iomem")
> Signed-off-by: Wei Yongjun 

Thanks for the patch. I plan on dropping that commit completely
from next soon. Autobuilder has shown it is missing some conversions
that it was intended to cover.

Regards
Greg


> ---
>  arch/m68k/coldfire/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
> index 9d6342c..a7c2332 100644
> --- a/arch/m68k/coldfire/pci.c
> +++ b/arch/m68k/coldfire/pci.c
> @@ -218,7 +218,7 @@ static int __init mcf_pci_init(void)
>  
>   /* Keep a virtual mapping to IO/config space active */
>   iospace = ioremap(PCI_IO_PA, PCI_IO_SIZE);
> - if (IS_ERR(iospace))
> + if (!iospace)
>   return -ENODEV;
>   pr_info("Coldfire: PCI IO/config window mapped to 0x%p\n", iospace);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH -next] m68k: fix return value check in mcf_pci_init()

[Greg Ungerer]

Hi Wei,

On 18/04/18 23:57, Wei Yongjun wrote:
> In case of error, the function ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be
> replaced with NULL test.
> 
> Fixes: bf114d773167 ("m68k: force use of __raw_read/__raw_write address to be 
> iomem")
> Signed-off-by: Wei Yongjun 

Thanks for the patch. I plan on dropping that commit completely
from next soon. Autobuilder has shown it is missing some conversions
that it was intended to cover.

Regards
Greg


> ---
>  arch/m68k/coldfire/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
> index 9d6342c..a7c2332 100644
> --- a/arch/m68k/coldfire/pci.c
> +++ b/arch/m68k/coldfire/pci.c
> @@ -218,7 +218,7 @@ static int __init mcf_pci_init(void)
>  
>   /* Keep a virtual mapping to IO/config space active */
>   iospace = ioremap(PCI_IO_PA, PCI_IO_SIZE);
> - if (IS_ERR(iospace))
> + if (!iospace)
>   return -ENODEV;
>   pr_info("Coldfire: PCI IO/config window mapped to 0x%p\n", iospace);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[PATCH -next] m68k: fix return value check in mcf_pci_init()

[Wei Yongjun]

In case of error, the function ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.

Fixes: bf114d773167 ("m68k: force use of __raw_read/__raw_write address to be 
iomem")
Signed-off-by: Wei Yongjun 
---
 arch/m68k/coldfire/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
index 9d6342c..a7c2332 100644
--- a/arch/m68k/coldfire/pci.c
+++ b/arch/m68k/coldfire/pci.c
@@ -218,7 +218,7 @@ static int __init mcf_pci_init(void)
 
/* Keep a virtual mapping to IO/config space active */
iospace = ioremap(PCI_IO_PA, PCI_IO_SIZE);
-   if (IS_ERR(iospace))
+   if (!iospace)
return -ENODEV;
pr_info("Coldfire: PCI IO/config window mapped to 0x%p\n", iospace);

[PATCH -next] m68k: fix return value check in mcf_pci_init()

[Wei Yongjun]

In case of error, the function ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.

Fixes: bf114d773167 ("m68k: force use of __raw_read/__raw_write address to be 
iomem")
Signed-off-by: Wei Yongjun 
---
 arch/m68k/coldfire/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
index 9d6342c..a7c2332 100644
--- a/arch/m68k/coldfire/pci.c
+++ b/arch/m68k/coldfire/pci.c
@@ -218,7 +218,7 @@ static int __init mcf_pci_init(void)
 
/* Keep a virtual mapping to IO/config space active */
iospace = ioremap(PCI_IO_PA, PCI_IO_SIZE);
-   if (IS_ERR(iospace))
+   if (!iospace)
return -ENODEV;
pr_info("Coldfire: PCI IO/config window mapped to 0x%p\n", iospace);