and while at that, save a register and drop the irq variable which is used right before initializing it to retu->irq.
Signed-off-by: Felipe Balbi <[email protected]> --- drivers/cbus/retu.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c index 4c8a7ea..d0454bd 100644 --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c @@ -438,7 +438,6 @@ static int __init retu_probe(struct platform_device *pdev) int ret = -ENOMEM; int rev; - int irq; retu = kzalloc(sizeof(*retu), GFP_KERNEL); if (!retu) { @@ -447,16 +446,14 @@ static int __init retu_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, retu); - the_retu = retu; - mutex_init(&retu->mutex); - - irq = platform_get_irq(pdev, 0); + retu->irq = platform_get_irq(pdev, 0); + retu->irq_base = pdata->irq_base; + retu->irq_end = pdata->irq_end; + retu->devid = pdata->devid; + the_retu = retu; - retu->irq = irq; - retu->irq_base = pdata->irq_base; - retu->irq_end = pdata->irq_end; - retu->devid = pdata->devid; + mutex_init(&retu->mutex); retu_irq_init(retu); @@ -471,14 +468,14 @@ static int __init retu_probe(struct platform_device *pdev) /* Mask all RETU interrupts */ __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - ret = request_threaded_irq(irq, NULL, retu_irq_handler, 0, + ret = request_threaded_irq(retu->irq, NULL, retu_irq_handler, 0, "retu", retu); if (ret < 0) { dev_err(&pdev->dev, "Unable to register IRQ handler\n"); goto err1; } - set_irq_wake(irq, 1); + set_irq_wake(retu->irq, 1); /* Register power off function */ pm_power_off = retu_power_off; @@ -493,7 +490,7 @@ static int __init retu_probe(struct platform_device *pdev) err2: __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - free_irq(irq, retu); + free_irq(retu->irq, retu); err1: kfree(retu); @@ -506,13 +503,13 @@ err0: static int __exit retu_remove(struct platform_device *pdev) { struct retu *retu = platform_get_drvdata(pdev); - int irq; irq = platform_get_irq(pdev, 0); /* Mask all RETU interrupts */ __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - free_irq(irq, retu); + + free_irq(retu->irq, retu); retu_irq_exit(retu); kfree(retu); the_retu = NULL; -- 1.7.4.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
