From patchwork Thu Aug 28 14:35:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 36230 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 71B6A202DD for ; Thu, 28 Aug 2014 14:37:19 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id i138sf7533052oig.0 for ; Thu, 28 Aug 2014 07:37:19 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=5vCDQGTFXD/k8qkY4DjgHM+HmWq9K6aV6dHeXbzwiIg=; b=OoMUFdf5fUgfy02am3OL/ETbiICSSSbUmi4oHpmg4Bc+Xpsq2qRa8eet1SlLh9icXA rBMl5yLzDbNAGMkAOvt02dFc7848eFdRPQi/xZ5/h/ZE2O2BJXRZVo+4lI6LfjhV1yeu iA96PkavK4X8Ka4zhektg5NVSQUCa1lNzXKdrVdXu7tnpo4Y30diSbWs/h1oIpeUagZT MY8wfMIwQT3y7Pdz1f6Cbxf0QzMq3+9CVuLD2Klf3lRn+8w2Hcu2osBAorm7X883bQHU zdGa4PBPD08O1LhtbjcGNlRRSUcbk+jm5MH7rXhNGuLkQyj6aIgL1N9LwU/3Ajkcgc4r bbJg== X-Gm-Message-State: ALoCoQlVJppflnmxFMDsUBPUY01A6NuLzZQRjyjka8KYP+mii0pSl409AKZ58rbuMBgj+l5fMYgQ X-Received: by 10.182.213.105 with SMTP id nr9mr2334439obc.36.1409236639100; Thu, 28 Aug 2014 07:37:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.232 with SMTP id 95ls626117qgb.94.gmail; Thu, 28 Aug 2014 07:37:19 -0700 (PDT) X-Received: by 10.221.5.137 with SMTP id og9mr3686072vcb.18.1409236638969; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id yt9si3690139vdb.21.2014.08.28.07.37.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 07:37:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so906528vcb.2 for ; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) X-Received: by 10.52.73.202 with SMTP id n10mr932896vdv.86.1409236638847; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp246768vcb; Thu, 28 Aug 2014 07:37:18 -0700 (PDT) X-Received: by 10.66.197.132 with SMTP id iu4mr6515804pac.132.1409236636635; Thu, 28 Aug 2014 07:37:16 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id so2si6871082pab.132.2014.08.28.07.37.16 for ; Thu, 28 Aug 2014 07:37:16 -0700 (PDT) Received-SPF: none (google.com: linux-i2c-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751859AbaH1OgJ (ORCPT + 1 other); Thu, 28 Aug 2014 10:36:09 -0400 Received: from mail-qa0-f50.google.com ([209.85.216.50]:38538 "EHLO mail-qa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719AbaH1OgI (ORCPT ); Thu, 28 Aug 2014 10:36:08 -0400 Received: by mail-qa0-f50.google.com with SMTP id cm18so774677qab.23 for ; Thu, 28 Aug 2014 07:36:07 -0700 (PDT) X-Received: by 10.140.107.198 with SMTP id h64mr6752877qgf.42.1409236567506; Thu, 28 Aug 2014 07:36:07 -0700 (PDT) Received: from localhost.localdomain (host86-152-0-170.range86-152.btcentralplus.com. [86.152.0.170]) by mx.google.com with ESMTPSA id o2sm5797541qgo.17.2014.08.28.07.36.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 07:36:07 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org Subject: [PATCH 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Date: Thu, 28 Aug 2014 15:35:37 +0100 Message-Id: <1409236538-21274-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409236538-21274-1-git-send-email-lee.jones@linaro.org> References: <1409236538-21274-1-git-send-email-lee.jones@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-i2c@vger.kernel.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.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 3a26045..3372c47 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1134,8 +1134,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; @@ -1262,7 +1261,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, };