> > - ioarea = request_mem_region(mem->start, resource_size(mem),
> > - pdev->name);
> > - if (!ioarea) {
> > - dev_err(&pdev->dev, "I2C region already claimed\n");
> > - return -EBUSY;
> > - }
>
> Shouldn't you have dropped the 'ioarea' variable? It should be unused
> now...
Indeed, this is probably the case. I will check.
> > @@ -699,14 +685,15 @@ static int davinci_i2c_probe(struct platform_device
> > *pdev)
> [...]
> > - dev->base = ioremap(mem->start, resource_size(mem));
> > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>
> Why you dropped check form 'mem' being NULL?
devm_request_and_ioremap does the check. There have been some discussions
about this before. Since the code is overall complicated and error-prone,
it seems better to minimize it when possible.
> > + dev->base = devm_request_and_ioremap(&pdev->dev, mem);
> > if (!dev->base) {
> > r = -EBUSY;
> > goto err_mem_ioremap;
> > @@ -714,16 +701,17 @@ static int davinci_i2c_probe(struct platform_device
> > *pdev)
> >
> > i2c_davinci_init(dev);
> >
> > - r = request_irq(dev->irq, i2c_davinci_isr, 0, pdev->name, dev);
> > + r = devm_request_irq(&pdev->dev, dev->irq, i2c_davinci_isr, 0,
> > + pdev->name, dev);
> > if (r) {
> > dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq);
> > - goto err_unuse_clocks;
> > + goto err_mem_ioremap;
>
> The label no longer corresponds the failure happening. Perhaps it's better
> to
> leave 'err_unuse_clocks'...
OK. It seemed nicer not to have a stack of empty labels...
I'll send another patch shortly.
julia
> > }
> >
> > r = i2c_davinci_cpufreq_register(dev);
> > if (r) {
> > dev_err(&pdev->dev, "failed to register cpufreq\n");
> > - goto err_free_irq;
> > + goto err_mem_ioremap;
>
> Ditto...
>
> > @@ -740,26 +728,18 @@ static int davinci_i2c_probe(struct platform_device
> > *pdev)
> > r = i2c_add_numbered_adapter(adap);
> > if (r) {
> > dev_err(&pdev->dev, "failure adding adapter\n");
> > - goto err_free_irq;
> > + goto err_mem_ioremap;
>
> Ditto...
>
> WBR, Sergei
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
