From patchwork Fri Jun 6 15:52:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 31499 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A0850202DA for ; Fri, 6 Jun 2014 15:53:07 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf13724991iec.8 for ; Fri, 06 Jun 2014 08:53:07 -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=nwyzYCrc8feHxnGIBc9tQ3PL2ZxQOXPU8GeWQiF1l6w=; b=Vc5LYhMKoyo15s/bdooqMc/v3D5yPV/+RiaxiOS/a0HDnfFjDdyykiInac3Au5qAjt IfuGOUG3FsF8xAG08ZHhLkTGzk4LRitC+rt5kcEw9n2m38uXLriBN5Cs9wjkvwgmUR4O 6986fTcVY7Tf4cwaxa9auGONpsdRTnZFQH7KmLdiEBUiKxfATwhB/r7P5ZslrfVfAGCr IJqk6ird7qXEYVLQnX8a3zbcgtZq47brMHlUe1zV4MYhyCWWEpD59nY/9JuSSj53IzEw VdscF7AlP4oWP4YEGZoxqF+K0ok/mNTjJ8CUPAdIo4rkpH2k1nHbwoyFEt8D+ZCDQ7QR Q+XA== X-Gm-Message-State: ALoCoQm3TA6vVPkHDNQl7Ixv2fd3dVsAfVKmKIPrQbA8jzH7z0mtGi5+J3S0rALTjG8pGZtkYBHA X-Received: by 10.182.73.200 with SMTP id n8mr3126830obv.33.1402069987166; Fri, 06 Jun 2014 08:53:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.166 with SMTP id z35ls743707qgz.93.gmail; Fri, 06 Jun 2014 08:53:07 -0700 (PDT) X-Received: by 10.58.29.106 with SMTP id j10mr6421074veh.31.1402069987066; Fri, 06 Jun 2014 08:53:07 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id d3si5414189vck.42.2014.06.06.08.53.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id lf12so3255638vcb.17 for ; Fri, 06 Jun 2014 08:53:07 -0700 (PDT) X-Received: by 10.58.186.207 with SMTP id fm15mr6833023vec.4.1402069986997; Fri, 06 Jun 2014 08:53:06 -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.54.6 with SMTP id vs6csp115267vcb; Fri, 6 Jun 2014 08:53:06 -0700 (PDT) X-Received: by 10.50.87.102 with SMTP id w6mr10335582igz.31.1402069986457; Fri, 06 Jun 2014 08:53:06 -0700 (PDT) Received: from mail-ig0-f180.google.com (mail-ig0-f180.google.com [209.85.213.180]) by mx.google.com with ESMTPS id ro1si48492809igb.33.2014.06.06.08.53.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:06 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.180 as permitted sender) client-ip=209.85.213.180; Received: by mail-ig0-f180.google.com with SMTP id c1so1008583igq.13 for ; Fri, 06 Jun 2014 08:53:06 -0700 (PDT) X-Received: by 10.51.17.97 with SMTP id gd1mr7532511igd.18.1402069986216; Fri, 06 Jun 2014 08:53:06 -0700 (PDT) Received: from localhost.localdomain (host86-181-29-77.range86-181.btcentralplus.com. [86.181.29.77]) by mx.google.com with ESMTPSA id j1sm27388094ige.0.2014.06.06.08.53.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 08:53:05 -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, linus.walleij@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, Lee Jones Subject: [PATCH 8/9] mfd: 88pm860x: Move over to new I2C device .probe() call Date: Fri, 6 Jun 2014 16:52:31 +0100 Message-Id: <1402069952-28022-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402069952-28022-1-git-send-email-lee.jones@linaro.org> References: <1402069952-28022-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.220.172 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. 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, };