From patchwork Fri Jan 11 17:57:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 1966951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 1D5A6DF2A2 for ; Fri, 11 Jan 2013 18:02:42 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TtisQ-0007hR-IL; Fri, 11 Jan 2013 17:58:46 +0000 Received: from mail-ee0-f74.google.com ([74.125.83.74]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TtirY-0007H6-0D for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2013 17:57:53 +0000 Received: by mail-ee0-f74.google.com with SMTP id l10so36943eei.5 for ; Fri, 11 Jan 2013 09:57:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=PSUyTak+pjxmJf3bucLinSggd5JtOUUjl91mE6oFcIA=; b=RB2WfUt52CYKg4v5TN8UBXEkOKEMhPbT/0sLOrC4r6ifKQqOhoJkxP7DcNvHJsQEKf JiViNbUh/sOf1A/dKLD9d+0iebzqMAC0MLYQLfIPu7wOsDTTwVkTO5tFJN6swuirlqsW 13oyJvkLmdNrQ81HKbVAD5S4NFIRxNnp4TmispHJSsCdgci232uqO4FaE3SvCKah8ujw FnAVSQKd5u1EYrWr2LFDf22P918YqyH8NJ9vYLP53EhAMxaglJcQobuxHQUrvXESlVP4 5zGq+E9vnB/OcOG0/9u43KHW/WiAmKMTrPJ37VrCEAUdSkiay4dgit3zCTZaDOeE+nrs KPwg== X-Received: by 10.14.180.2 with SMTP id i2mr11946565eem.1.1357927063957; Fri, 11 Jan 2013 09:57:43 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id g9si2362129eeo.1.2013.01.11.09.57.43 (version=TLSv1 cipher=AES128-SHA bits=128/128); Fri, 11 Jan 2013 09:57:43 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 2E4D320004E; Fri, 11 Jan 2013 09:57:43 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 0C6D28079A; Fri, 11 Jan 2013 09:57:41 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Mark Brown Subject: [REPOST PATCH 2/2] i2c: pxa: Use i2c-core to get bus number now Date: Fri, 11 Jan 2013 09:57:07 -0800 Message-Id: <1357927027-4857-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1357927027-4857-1-git-send-email-dianders@chromium.org> References: <1353522362-25519-2-git-send-email-dianders@chromium.org> <1357927027-4857-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQmi8s3jyti36xAvKXPb3BxzOpwnINvwhwIamEhTNmtTlU/juEskKZ35cp2XFZoWurZSgat1J6iVos6Ljqw7EXW97Iru+E7c/QxfRgXBPTzwCWzQcds3AiQx7xiShQpV7yX/xOAtK1Icnz45c6ejXiUB2TzUCWCJmGys8rrxRU2I6f3HqEjasRDuMbmOC5qrpNe2qy56aYUEz+RYw7HTJTNJ2CDlow== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130111_125752_667141_0698C01E X-CRM114-Status: GOOD ( 12.86 ) X-Spam-Score: -0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.74 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kukjin Kim , Arnd Bergmann , Padmavathi Venna , linux-kernel@vger.kernel.org, Wolfram Sang , Haojian Zhuang , Doug Anderson , linux-samsung-soc@vger.kernel.org, Thomas Abraham , Karol Lewandowski , Ben Dooks , Olof Johansson , Andrew Morton , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 Acked-by: Haojian Zhuang --- 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))