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: 516748 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0FD7D140785 for ; Fri, 11 Sep 2015 21:58:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=bQsRbEyb; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752698AbbIKL6d (ORCPT ); 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sc3Zczpy8GkHixU/0Wj4B/LX03S/IPUOlERs+0YU+ng=; b=bQsRbEybNZ1nZoteWrXKnyHAA9po76K6RNmloffD9RbHzID0cKXCSSZpC6FxHOY0tQ 0Zkk3KC+7hzyAeiE+z7YRPXDYiXTsA9jYaU9B/bvmO1UzTyWPQTTYKKqYADL1byuf2wt /gwfBlb2RQ1JiUoHc3trsBOMzdQzp5tS9eB9pE2aib+1FLTqDrMlA9HxuMRWNu1r38A9 tk92TA3wJXAF4gNK6iwJmOMrhnwcMRj+Zy76rxAXinVMrEO+IYnh+p6c5xNnKtfU6UFy Qaz+v+MZcYjHoMwR0nidz/mmnTrrj8EqXTUGTP4vk6sKw1o9g67jDVDUB3EKwAxhpQDS OmBw== 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-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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, };