From patchwork Sun Jun 4 09:18:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J, KEERTHY" X-Patchwork-Id: 9764739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16D95601D7 for ; Sun, 4 Jun 2017 09:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A4AE27F9F for ; Sun, 4 Jun 2017 09:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2ADC28426; Sun, 4 Jun 2017 09:21:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AF4627F9F for ; Sun, 4 Jun 2017 09:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbdFDJUz (ORCPT ); Sun, 4 Jun 2017 05:20:55 -0400 Received: from fllnx210.ext.ti.com ([198.47.19.17]:37301 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229AbdFDJTu (ORCPT ); Sun, 4 Jun 2017 05:19:50 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v549JXJG007787; Sun, 4 Jun 2017 04:19:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496567973; bh=1p7YoPTniKTpSg7suBkB5XQjSUfCXn0DcHdk7Em1zII=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Axvpy6tB6/Tk55f3FbjxkYnB3m5T5NDk1arE4NL4IYJ0Wg6t47K29iPN4bl5zyidK 1DZrYX5pZLT64kbyECOmfxB+9AzrZovy9MZ+qMxXafTr7O4i9raDi4tSfrA6Fqfila DDkOerOWpek0CL5eBZtH6ygutZsRBUsCjsXay0tA= Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v549JXlJ005365; Sun, 4 Jun 2017 04:19:33 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Sun, 4 Jun 2017 04:19:32 -0500 Received: from ula0393675.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v549J1F4009261; Sun, 4 Jun 2017 04:19:28 -0500 From: Keerthy To: , , CC: , , Subject: [PATCH 3/9] mfd: palmas: Remove redundant i2c_device_id Date: Sun, 4 Jun 2017 14:48:38 +0530 Message-ID: <1496567924-4278-4-git-send-email-j-keerthy@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496567924-4278-1-git-send-email-j-keerthy@ti.com> References: <1496567924-4278-1-git-send-email-j-keerthy@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the introduction of probe_new function the i2c_device_id is no longer needed. Hence the remove the same and use probe_new instead of probe. Signed-off-by: Keerthy --- Boot tested on dra7-evm and dra72-evm and checked for regulator registrations. drivers/mfd/palmas.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 9103aff..db9e53c 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -499,8 +499,7 @@ struct palmas_driver_data { }; MODULE_DEVICE_TABLE(of, of_palmas_match_tbl); -static int palmas_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int palmas_i2c_probe(struct i2c_client *i2c) { struct palmas *palmas; struct palmas_platform_data *pdata; @@ -717,23 +716,13 @@ static int palmas_i2c_remove(struct i2c_client *i2c) return 0; } -static const struct i2c_device_id palmas_i2c_id[] = { - { "palmas", }, - { "twl6035", }, - { "twl6037", }, - { "tps65913", }, - { /* end */ } -}; -MODULE_DEVICE_TABLE(i2c, palmas_i2c_id); - static struct i2c_driver palmas_i2c_driver = { .driver = { .name = "palmas", .of_match_table = of_palmas_match_tbl, }, - .probe = palmas_i2c_probe, + .probe_new = palmas_i2c_probe, .remove = palmas_i2c_remove, - .id_table = palmas_i2c_id, }; static int __init palmas_i2c_init(void)