| Message ID | 1357927027-4857-3-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On 01/11/2013 06:57 PM, Doug Anderson wrote: > The commit: "i2c-core: dt: Pick i2c bus number from i2c alias if > present" adds support for automatically picking the bus number based > on the alias ID. Remove the now unnecessary code from i2c-pxa that > did the same thing. > > Signed-off-by: Doug Anderson<dianders@chromium.org> > Acked-by: Haojian Zhuang<haojian.zhuang@gmail.com> > --- > drivers/i2c/busses/i2c-pxa.c | 8 +------- > 1 files changed, 1 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c > index 1034d93..8ee9fa0 100644 > --- a/drivers/i2c/busses/i2c-pxa.c > +++ b/drivers/i2c/busses/i2c-pxa.c > @@ -1053,16 +1053,10 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, > struct device_node *np = pdev->dev.of_node; > const struct of_device_id *of_id = > of_match_device(i2c_pxa_dt_ids,&pdev->dev); > - int ret; > > if (!of_id) > return 1; > - ret = of_alias_get_id(np, "i2c"); > - if (ret< 0) { > - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); > - return ret; > - } > - pdev->id = ret; > + pdev->id = -1; I think assignments like this are illegal. At this point the device is already registered and modifying pdev->id can cause issues at the core code. It might be better to have the bus number stored in struct pxa_i2c, initialized with pdev->id value for non-dt and now with -1 for dt case. I realize it is not something your patch is intended to deal with, but since you're touching this code maybe it's worth to fix that issue as well ? -- Thanks, Sylwester
Sylwester, Thanks for the review... On Fri, Jan 11, 2013 at 2:12 PM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: >> - ret = of_alias_get_id(np, "i2c"); >> - if (ret< 0) { >> - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", >> ret); >> - return ret; >> - } >> - pdev->id = ret; >> + pdev->id = -1; > > > I think assignments like this are illegal. At this point the device is > already registered and modifying pdev->id can cause issues at the core > code. Good catch. I think the old code is just as illegal since it was also assigning to pdev->id, but I'm happy to spin the patch. > It might be better to have the bus number stored in struct pxa_i2c, > initialized with pdev->id value for non-dt and now with -1 for dt case. I'll just init i2c->adap.nr before calling i2c_pxa_probe_dt(). Then i2c_pxa_probe_dt() can adjust the number. Hopefully this is OK. > I realize it is not something your patch is intended to deal with, > but since you're touching this code maybe it's worth to fix that issue > as well ? Sure, I've spun it. While doing this I realized a few other issues relating to the ID number. Specifically: * We were using the id (as %u) when creating 'i2c->adap.name'. This probably gave a very nonsensical ID. I'm just going to remove the device number from the adap.name. That matches what i2c-s3c2410.c does. As far as I can tell the adap.name isn't actually used for much. * The name was being used in request_irq(). I've changed this to be like i2c-s3c2410 and use dev_name(). On my current board that means that the name comes from the table in of_platform_populate(). ...but that table is supposed to be going away. If I remove that i2c parts of that table I get names like '12c60000.i2c', which should be fine for passing to request_irq(). -Doug
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..8ee9fa0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1053,16 +1053,10 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, struct device_node *np = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(i2c_pxa_dt_ids, &pdev->dev); - int ret; if (!of_id) return 1; - ret = of_alias_get_id(np, "i2c"); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); - return ret; - } - pdev->id = ret; + pdev->id = -1; if (of_get_property(np, "mrvl,i2c-polling", NULL)) i2c->use_pio = 1; if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))