clocksource: zevio-timer: fix incorrect function definition so the correct function pointer is passed to CLOCKSOURCE_OF_DECLARE
Subsystems (3)
PATCH 1/2 clocksource: zevio-timer: fix incorrect function definition so the correct function pointer is passed to CLOCKSOURCE_OF_DECLARE
From: Daniel Tang <[email protected]>
Signed-off-by Daniel Tang <[email protected]>
--- drivers/clocksource/zevio-timer.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/clocksource/zevio-timer.c +9 -10
@@ -122,28 +122,27 @@ static irqreturn_t zevio_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __init zevio_timer_add (struct device_node *node) +static void __init zevio_timer_add (struct device_node *node) {struct zevio_timer *timer;struct resource res; -int irqnr, ret; +int irqnr; timer =kzalloc (sizeof (*timer),GFP_KERNEL );if (!timer) -return -ENOMEM ; +return ; timer->base =of_iomap (node,0 ); -if (!timer->base) { - ret = -EINVAL ; +if (!timer->base) goto error_free; - } + timer->timer1 = timer->base +IO_TIMER1 ; timer->timer2 = timer->base +IO_TIMER2 ; timer->clk =of_clk_get (node,0 );if (IS_ERR (timer->clk)) { - ret =PTR_ERR (timer->clk); -pr_err ("Timer clock not found! (error %d)\n" , ret); +pr_err ("Timer clock not found! (error %d)\n" , + (int )PTR_ERR (timer->clk)); goto error_unmap; }
@@ -204,12 +203,12 @@ static int __init zevio_timer_add(struct device_node *node)pr_info ("Added %s as clocksource\n" , timer->clocksource_name); -return 0 ; +return ; error_unmap:iounmap (timer->base); error_free:kfree (timer); -return ret; +return ; }CLOCKSOURCE_OF_DECLARE (zevio_timer,"lsi,zevio-timer" , zevio_timer_add);
--
1.8.1.3
PATCH 2/2 arm: nspire: fix nspire_restart to take enum reboot_mode instead of a char so the correct function pointer is passed to DT_MACHINE_START
From: Daniel Tang <[email protected]>
Signed-off-by Daniel Tang <[email protected]>
--- arch/arm/mach-nspire/nspire.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-nspire/nspire.c +1 -1
@@ -63,7 +63,7 @@ static void __init nspire_init(void) nspire_auxdata, NULL); } -static void nspire_restart (char mode,const char *cmd) +static void nspire_restart (enum reboot_mode mode,const char *cmd) {void __iomem *base =ioremap (NSPIRE_MISC_PHYS_BASE ,SZ_4K );if (!base)
--
1.8.1.3
Quoted 2 lines · On Mon, 25 Nov 2013, [email protected] wrote:
From: Daniel Tang <[email protected]>
This really needs a proper changelog.
Quoted 64 lines
Signed-off-by Daniel Tang <[email protected]>--- drivers/clocksource/zevio-timer.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)drivers/clocksource/zevio-timer.c +9
-11@@ -122,28 +122,27 @@ static irqreturn_t zevio_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __init zevio_timer_add (struct device_node *node) +static void __init zevio_timer_add (struct device_node *node) {struct zevio_timer *timer;struct resource res; -int irqnr, ret; +int irqnr; timer =kzalloc (sizeof (*timer),GFP_KERNEL );if (!timer) -return -ENOMEM ; +return ; timer->base =of_iomap (node,0 ); -if (!timer->base) { - ret = -EINVAL ; +if (!timer->base) goto error_free; - } + timer->timer1 = timer->base +IO_TIMER1 ; timer->timer2 = timer->base +IO_TIMER2 ; timer->clk =of_clk_get (node,0 );if (IS_ERR (timer->clk)) { - ret =PTR_ERR (timer->clk); -pr_err ("Timer clock not found! (error %d)\n" , ret); +pr_err ("Timer clock not found! (error %d)\n" , + (int )PTR_ERR (timer->clk)); goto error_unmap; }@@ -204,12 +203,12 @@ static int __init zevio_timer_add(struct device_node *node)pr_info ("Added %s as clocksource\n" , timer->clocksource_name); -return 0 ; +return ; error_unmap:iounmap (timer->base); error_free:kfree (timer); -return ret; +return ; }CLOCKSOURCE_OF_DECLARE (zevio_timer,"lsi,zevio-timer" , zevio_timer_add); --1.8.1.3
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 6 lines · Jiri Kosina
Quoted 2 lines · On Mon, 25 Nov 2013, [email protected] wrote:
From: Daniel Tang <[email protected]>
This really needs a proper changelog.
Along with a proper subject line. Subject lines should give a quick scope of the patch. The detailed explanation has to be in the changelog itself.
Thanks,
tglx