From patchwork Fri Jun 20 12:02:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 32270 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACE5E203C2 for ; Fri, 20 Jun 2014 12:03:36 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id v10sf11561499pde.7 for ; Fri, 20 Jun 2014 05:03:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=w2S6qZSysemt68S36pP1GwBvR7ZqrWrU3/thmU8h88c=; b=APLTFJdcmadV/LNU79OGZ1vjg5JeDI/866nOnLtuLLWz/mCc90EP6FDbOYkWg2m4YR QwqFKK8UqYKaWJMjVy1Q85j3NnnBcZ01mokgOcM6D54HUt7KSyJi6CmGhn0vaYEjkTTB 74a4JiBGLOywpkxqXs/pMmHd5i2Aoz5baO1jcU792qCjUOe/8PSuG0UzNSoXtghJGMpS wdhZooawG/MZk+xFU49xIAqkYsLJDmCW0kJo1dJUCvNigZeQUCqd4XFBwMh/HL8Lt10S 2qlTh8HxGn4vJiZ+86OdhEv7C/Q0WUYxU8I1KQdstQMvz8sJxWSQNZLTAkSOv64YqHoC Xw7w== X-Gm-Message-State: ALoCoQlJ3MHvpY21Z/wQ1OZIjcXV7CsflvRRdCB7YM5K2ovcadxqoRghdlpx2tsWCxG+n5nV9TUJ X-Received: by 10.66.65.202 with SMTP id z10mr1147177pas.45.1403265816016; Fri, 20 Jun 2014 05:03:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.107 with SMTP id 98ls912185qga.80.gmail; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr2519936vco.25.1403265815920; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id ut8si3877836vec.4.2014.06.20.05.03.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id db11so3431875veb.40 for ; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) X-Received: by 10.58.119.75 with SMTP id ks11mr2694444veb.20.1403265815852; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp16611vcb; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) X-Received: by 10.50.43.225 with SMTP id z1mr3689146igl.24.1403265815404; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) Received: from mail-ig0-f170.google.com (mail-ig0-f170.google.com [209.85.213.170]) by mx.google.com with ESMTPS id by9si14476284icc.31.2014.06.20.05.03.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.170 as permitted sender) client-ip=209.85.213.170; Received: by mail-ig0-f170.google.com with SMTP id h15so673981igd.5 for ; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) X-Received: by 10.50.1.52 with SMTP id 20mr3733309igj.34.1403265815173; Fri, 20 Jun 2014 05:03:35 -0700 (PDT) Received: from localhost.localdomain (host109-148-235-194.range109-148.btcentralplus.com. [109.148.235.194]) by mx.google.com with ESMTPSA id qn5sm3890078igb.7.2014.06.20.05.03.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 05:03:34 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 8/9] mfd: 88pm860x: Move over to new I2C device .probe() call Date: Fri, 20 Jun 2014 13:02:32 +0100 Message-Id: <1403265753-25851-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1403265753-25851-1-git-send-email-lee.jones@linaro.org> References: <1403265753-25851-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As part of an effort to rid the mostly unused second parameter for I2C related .probe() functions and to conform to other existing frameworks we're moving over to a temporary replacement .probe() call-back. Acked-by: Grant Likely Signed-off-by: Lee Jones --- drivers/mfd/88pm860x-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index bcfc9e8..d763f1f 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1127,8 +1127,7 @@ static int pm860x_dt_init(struct device_node *np, return 0; } -static int pm860x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pm860x_probe(struct i2c_client *client) { struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev); struct device_node *node = client->dev.of_node; @@ -1255,7 +1254,7 @@ static struct i2c_driver pm860x_driver = { .pm = &pm860x_pm_ops, .of_match_table = pm860x_dt_ids, }, - .probe = pm860x_probe, + .probe2 = pm860x_probe, .remove = pm860x_remove, .id_table = pm860x_id_table, };