[PATCH 1/3] clocksource/drivers/ixp4xx: Drop ifdef

[PATCH 1/3] clocksource/drivers/ixp4xx: Drop ifdef

[Linus Walleij]

As the sched_clock registration was put inside an ifdef
in the driver, but this is not appropriate, the ifdef
is only appropriate for delay_timer, which is not yet
implemented.

Fixes: 13e0b4059b98 ("clocksource/drivers/ixp4xx: Add driver")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC folks: please apply this directly on the IXP4xx
branch where the IXP4xx rework is pending for v5.2.
---
 drivers/clocksource/timer-ixp4xx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
index 404445bc11ea..5c2190b654cd 100644
--- a/drivers/clocksource/timer-ixp4xx.c
+++ b/drivers/clocksource/timer-ixp4xx.c
@@ -222,9 +222,7 @@ static __init int ixp4xx_timer_register(void __iomem *base,
 	clockevents_config_and_register(&tmr->clkevt, timer_freq,
 					0xf, 0xfffffffe);
 
-#ifdef CONFIG_ARM
 	sched_clock_register(ixp4xx_read_sched_clock, 32, timer_freq);
-#endif
 
 	return 0;
 }
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/3] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe

[Linus Walleij]

From: Dan Carpenter <dan.carpenter@oracle.com>

The devm_ioremap_resource() function doesn't retunr NULL, it returns
error pointers.

Fixes: ecc133c6da60 ("soc: ixp4xx: qmgr: Pass resources")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC folks: please apply this directly on the IXP4xx
branch where the IXP4xx rework is pending for v5.2.
---
 drivers/soc/ixp4xx/ixp4xx-qmgr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
index 13a8a13c9b01..bb90670ec160 100644
--- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c
+++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
@@ -385,8 +385,8 @@ static int ixp4xx_qmgr_probe(struct platform_device *pdev)
 	if (!res)
 		return -ENODEV;
 	qmgr_regs = devm_ioremap_resource(dev, res);
-	if (!qmgr_regs)
-		return -ENOMEM;
+	if (IS_ERR(qmgr_regs))
+		return PTR_ERR(qmgr_regs);
 
 	irq1 = platform_get_irq(pdev, 0);
 	if (irq1 <= 0)
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/3] ARM: ixp4xx: Remove duplicated include from common.c

[Linus Walleij]

From: YueHaibing <yuehaibing@huawei.com>

Remove duplicated include.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC folks: please apply this directly on the IXP4xx
branch where the IXP4xx rework is pending for v5.2.
---
 arch/arm/mach-ixp4xx/common.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index cc5f15679d29..381f452de28d 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -27,7 +27,6 @@
 #include <linux/cpu.h>
 #include <linux/pci.h>
 #include <linux/sched_clock.h>
-#include <linux/bitops.h>
 #include <linux/irqchip/irq-ixp4xx.h>
 #include <linux/platform_data/timer-ixp4xx.h>
 #include <mach/udc.h>
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/3] clocksource/drivers/ixp4xx: Drop ifdef

[Daniel Lezcano]

On 06/05/2019 08:31, Linus Walleij wrote:
> As the sched_clock registration was put inside an ifdef
> in the driver, but this is not appropriate, the ifdef
> is only appropriate for delay_timer, which is not yet
> implemented.
> 
> Fixes: 13e0b4059b98 ("clocksource/drivers/ixp4xx: Add driver")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>


> ---
> ARM SoC folks: please apply this directly on the IXP4xx
> branch where the IXP4xx rework is pending for v5.2.
> ---
>  drivers/clocksource/timer-ixp4xx.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
> index 404445bc11ea..5c2190b654cd 100644
> --- a/drivers/clocksource/timer-ixp4xx.c
> +++ b/drivers/clocksource/timer-ixp4xx.c
> @@ -222,9 +222,7 @@ static __init int ixp4xx_timer_register(void __iomem *base,
>  	clockevents_config_and_register(&tmr->clkevt, timer_freq,
>  					0xf, 0xfffffffe);
>  
> -#ifdef CONFIG_ARM
>  	sched_clock_register(ixp4xx_read_sched_clock, 32, timer_freq);
> -#endif
>  
>  	return 0;
>  }
> 


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/3] clocksource/drivers/ixp4xx: Drop ifdef

[Olof Johansson]

On Mon, May 06, 2019 at 08:31:07AM +0200, Linus Walleij wrote:
> As the sched_clock registration was put inside an ifdef
> in the driver, but this is not appropriate, the ifdef
> is only appropriate for delay_timer, which is not yet
> implemented.
> 
> Fixes: 13e0b4059b98 ("clocksource/drivers/ixp4xx: Add driver")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC folks: please apply this directly on the IXP4xx
> branch where the IXP4xx rework is pending for v5.2.

Applied to arm/late, thanks!


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/3] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe

[Olof Johansson]

On Mon, May 06, 2019 at 08:31:08AM +0200, Linus Walleij wrote:
> From: Dan Carpenter <dan.carpenter@oracle.com>
> 
> The devm_ioremap_resource() function doesn't retunr NULL, it returns
> error pointers.
> 
> Fixes: ecc133c6da60 ("soc: ixp4xx: qmgr: Pass resources")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC folks: please apply this directly on the IXP4xx
> branch where the IXP4xx rework is pending for v5.2.

Applied to arm/late, thanks!


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 3/3] ARM: ixp4xx: Remove duplicated include from common.c

[Olof Johansson]

On Mon, May 06, 2019 at 08:31:09AM +0200, Linus Walleij wrote:
> From: YueHaibing <yuehaibing@huawei.com>
> 
> Remove duplicated include.
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC folks: please apply this directly on the IXP4xx
> branch where the IXP4xx rework is pending for v5.2.

Applied to arm/late, thanks!


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel