From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755573Ab2KUS27 (ORCPT ); Wed, 21 Nov 2012 13:28:59 -0500 Received: from mail-gg0-f202.google.com ([209.85.161.202]:47711 "EHLO mail-gg0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755525Ab2KUS25 (ORCPT ); Wed, 21 Nov 2012 13:28:57 -0500 From: Doug Anderson To: linux-i2c@vger.kernel.org, Mark Brown Cc: Kukjin Kim , Olof Johansson , Thomas Abraham , Padmavathi Venna , Ben Dooks , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Haojian Zhuang , Arnd Bergmann , Doug Anderson , Andrew Morton , Karol Lewandowski , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] i2c: pxa: Use i2c-core to get bus number now Date: Wed, 21 Nov 2012 10:26:02 -0800 Message-Id: <1353522362-25519-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1353522362-25519-1-git-send-email-dianders@chromium.org> References: <1353450428-2615-2-git-send-email-dianders@chromium.org> <1353522362-25519-1-git-send-email-dianders@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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