From patchwork Wed Sep 9 18:33:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 53326 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id D74A822B05 for ; Wed, 9 Sep 2015 18:34:55 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf9936756wic.1 for ; Wed, 09 Sep 2015 11:34:55 -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=5okCDXCOZZHJqVKPC0Ixb9qHXddeuXI7A6Sg7NjUpc0=; b=NDd282+E00dtxss6pqq00e+mZ/7sPykWlSgRYvzy6ZYY2Q2kso4W2PTtLTx0Byh+RH 8OrmFb+s2SPGgUC0v2t62qs3Du4Qjhw2+OEUUIwXEqZl7tpdq2YUcbO2uzDZhN62vfyu 9K0k7XjGrP2WgtQHjPufBExSRL0qYpNJvxZ4wUJXwVYDP4zbFFDR3jCcSZxWvDlsGdjW DNiF+v6b+gVLPjDo4D1MHQe9M6sDCumpEiNRlcLFEliVzNEofiOYudnlqzpVN874uTmU +sa0L4zEtzEXHv+TvoOIFTFSwmFvFq8Cedjt9v8sivj4P8NC1YV5e7YDFlieW30u9FqK mHaQ== X-Gm-Message-State: ALoCoQkpY0j7FdJvttiL3gjqKdYCPLBDYX0U3XxuoXaj5zBn2VdTj9KijlgGSfG5vUm595k0EiVX X-Received: by 10.194.93.198 with SMTP id cw6mr8534931wjb.3.1441823695192; Wed, 09 Sep 2015 11:34:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.163 with SMTP id cz3ls86293lac.45.gmail; Wed, 09 Sep 2015 11:34:55 -0700 (PDT) X-Received: by 10.112.130.3 with SMTP id oa3mr30654895lbb.13.1441823694985; Wed, 09 Sep 2015 11:34:54 -0700 (PDT) Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com. [2a00:1450:4010:c04::22a]) by mx.google.com with ESMTPS id qo1si7476265lbb.135.2015.09.09.11.34.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 11:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) client-ip=2a00:1450:4010:c04::22a; Received: by lbcjc2 with SMTP id jc2so10784697lbc.0 for ; Wed, 09 Sep 2015 11:34:54 -0700 (PDT) X-Received: by 10.152.18.133 with SMTP id w5mr20347902lad.72.1441823694773; Wed, 09 Sep 2015 11:34:54 -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.112.59.35 with SMTP id w3csp492159lbq; Wed, 9 Sep 2015 11:34:53 -0700 (PDT) X-Received: by 10.66.141.42 with SMTP id rl10mr64172032pab.18.1441823693759; Wed, 09 Sep 2015 11:34:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qu10si2304353pbb.181.2015.09.09.11.34.52; Wed, 09 Sep 2015 11:34:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754937AbbIISej (ORCPT + 28 others); Wed, 9 Sep 2015 14:34:39 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:33436 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754887AbbIISef (ORCPT ); Wed, 9 Sep 2015 14:34:35 -0400 Received: by wiclk2 with SMTP id lk2so1640330wic.0; Wed, 09 Sep 2015 11:34:33 -0700 (PDT) X-Received: by 10.180.85.229 with SMTP id k5mr58719807wiz.76.1441823673729; Wed, 09 Sep 2015 11:34:33 -0700 (PDT) Received: from localhost.localdomain (cpc17-aztw24-2-0-cust759.aztw.cable.virginm.net. [92.237.134.248]) by smtp.gmail.com with ESMTPSA id u1sm5155141wiz.22.2015.09.09.11.34.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 11:34:32 -0700 (PDT) From: Kieran Bingham To: Wolfram Sang , Samuel Ortiz , Lee Jones Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, grant.likely@linaro.org Subject: [PATCH v4 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Date: Wed, 9 Sep 2015 19:33:46 +0100 Message-Id: <1441823627-6227-8-git-send-email-kieranbingham@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> References: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: kieranbingham@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com 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: , From: Lee Jones 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 3269a99..a499d70 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1130,8 +1130,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; @@ -1257,7 +1256,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, };