From patchwork Fri Sep 11 11:56:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 53445 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id C189E215BF for ; Fri, 11 Sep 2015 11:58:45 +0000 (UTC) Received: by lanb10 with SMTP id b10sf25110579lan.3 for ; Fri, 11 Sep 2015 04:58:44 -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=gnmISvIpROr/clbZ3IvmxV6gU0KArYirqAon2lH87Dk=; b=fRczvYCLJVTzqtRwD0B9u2KU/S1JWR9Es4TWyjxj6uuHKLRU2wHKndpxqbj3gTQ3hS qrrjPSewkrLILV1hQNpaUMQ+2Nw72dObG97gTBhThWD/9Ix3+l1zx6l0zZ4+Q7qBaKgZ PERmAkUyPwnBHxaQGTaJdzepRn9CfIQL1mGxHED2e5np0GoT+ZwzSDHLGvgr0EA5vapt Il0fORlEkBkWHjTHTOYK+WgP+QbG7GPE5EywZNOlDKXh1H58sTyZwozbDFr59p3cgesK 5HfByPXgAZyA+ZUJlQ4YRdlfjoNLKB4y1UowJb9bRIdci/Q+344RZQC8VEArqJpe2YaR AWKA== X-Gm-Message-State: ALoCoQk4x7N+PoTbR74q3wPqUXwnTON+uKL9qJH3aEHr7JAAjDY3S6nUHgMJYxxLqJWzb6aDJti+ X-Received: by 10.112.170.67 with SMTP id ak3mr11146120lbc.6.1441972724772; Fri, 11 Sep 2015 04:58:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.137 with SMTP id d9ls329113laf.42.gmail; Fri, 11 Sep 2015 04:58:44 -0700 (PDT) X-Received: by 10.152.23.132 with SMTP id m4mr40402101laf.107.1441972724597; Fri, 11 Sep 2015 04:58:44 -0700 (PDT) Received: from mail-la0-x22c.google.com (mail-la0-x22c.google.com. [2a00:1450:4010:c03::22c]) by mx.google.com with ESMTPS id k7si13578lbj.50.2015.09.11.04.58.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 04:58:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::22c as permitted sender) client-ip=2a00:1450:4010:c03::22c; Received: by lamp12 with SMTP id p12so45631095lam.0 for ; Fri, 11 Sep 2015 04:58:44 -0700 (PDT) X-Received: by 10.152.21.196 with SMTP id x4mr41102081lae.117.1441972724480; Fri, 11 Sep 2015 04:58:44 -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 w3csp1542123lbq; Fri, 11 Sep 2015 04:58:43 -0700 (PDT) X-Received: by 10.107.8.212 with SMTP id h81mr2879870ioi.89.1441972723543; Fri, 11 Sep 2015 04:58:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l81si154871ioe.6.2015.09.11.04.58.42; Fri, 11 Sep 2015 04:58:43 -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 S1752914AbbIKL6d (ORCPT + 28 others); Fri, 11 Sep 2015 07:58:33 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36691 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752786AbbIKL5z (ORCPT ); Fri, 11 Sep 2015 07:57:55 -0400 Received: by wicgb1 with SMTP id gb1so59623495wic.1; Fri, 11 Sep 2015 04:57:54 -0700 (PDT) X-Received: by 10.180.102.164 with SMTP id fp4mr16615315wib.2.1441972674496; Fri, 11 Sep 2015 04:57:54 -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 wj4sm25354wjb.10.2015.09.11.04.57.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 04:57:53 -0700 (PDT) From: Kieran Bingham To: Wolfram Sang , Samuel Ortiz , Lee Jones Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, grant.likely@linaro.org, javier@osg.samsung.com, Kieran Bingham Subject: [RESEND PATCH v4 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Date: Fri, 11 Sep 2015 12:56:03 +0100 Message-Id: <1441972564-9621-8-git-send-email-kieranbingham@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441972564-9621-1-git-send-email-kieranbingham@gmail.com> References: <1441972564-9621-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:c03::22c 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 Signed-off-by: Kieran Bingham --- 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, };