From patchwork Wed Nov 21 18:26:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 1781961 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 AE54BDFF71 for ; Wed, 21 Nov 2012 18:31:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbF2j-0003Jg-7a; Wed, 21 Nov 2012 18:29:01 +0000 Received: from mail-ye0-f201.google.com ([209.85.213.201]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbF2f-0003IL-Vp for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2012 18:28:58 +0000 Received: by mail-ye0-f201.google.com with SMTP id m2so318055yen.0 for ; Wed, 21 Nov 2012 10:28:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=fMSgaP7tjareqzcooxSPru+D5L2e0UbCeM5cAaLSINE=; b=mRlEygs87w2srRl286wg0XXrEZMJ8rv5Czi3kjvPvEcv2SyLFbTLLqKgDrCMZl8RTw w8BbRB3OlZINuG53FhLfTz7ILRy1H+xAiW5fx+wY3iTETCIHXmIc+CJxVo8yZ+jnyAyF hYmbVFVm6WyFfDJfWmpClB2T6JIz0a15zzqofNHUL9+Jwn3yQa4HB2xpZ0gL5h9W5N/E 88pL9WrNOMUb1bGPYJFiSijra9qoPnxygq+moJPF0oU8bYGCnQ1vJOjz4zbw39RejGwb +gN9+tJs18XlnVDyzzrBDp7wprPTyk6OcEcNO+yoEpSFKJsRYQylanIk/N4zHCsQ8e4T LEuw== Received: by 10.236.134.232 with SMTP id s68mr15331035yhi.31.1353522536519; Wed, 21 Nov 2012 10:28:56 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id j36si36723anp.0.2012.11.21.10.28.56 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 21 Nov 2012 10:28:56 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 68722820241; Wed, 21 Nov 2012 10:28:56 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 2429580496; Wed, 21 Nov 2012 10:28:56 -0800 (PST) From: Doug Anderson To: linux-i2c@vger.kernel.org, Mark Brown 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> X-Gm-Message-State: ALoCoQnjoxLIj2bH8Yg2iOgGL/8VK8tmkI7oPSb/owJv9VFT8IZCbHNYOcjcJDxka0cxVKKCuKqSdEm/3SM5peUX9FI8qsw1IWIlrIWiSNxxP2Uk7ddzHMHw3oyNyu5GZKvd4B3GzHsxsZ6PvZxRciV8Ac/DjLmlMDYi+pWbo/eMeZ4pg+6qM9LtUQyjtAbP/CoOi78qu5DIituQsqXceRBs1MeGsYdyxA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121121_132858_104382_FF1C2C51 X-CRM114-Status: GOOD ( 13.36 ) 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 [209.85.213.201 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: Doug Anderson , Kukjin Kim , Arnd Bergmann , Padmavathi Venna , linux-kernel@vger.kernel.org, Wolfram Sang , Haojian Zhuang , 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))