On Thu, Nov 22, 2012 at 2:26 AM, Doug Anderson <dianders@xxxxxxxxxxxx> 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@xxxxxxxxxxxx>
> ---
> 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;
> if (of_get_property(np, "mrvl,i2c-polling", NULL))
> i2c->use_pio = 1;
> if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
> --
> 1.7.7.3
>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
