Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932918AbcDEMAt (ORCPT ); Tue, 5 Apr 2016 08:00:49 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11125 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932839AbcDEMAo (ORCPT ); Tue, 5 Apr 2016 08:00:44 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Tue, 05 Apr 2016 04:58:48 -0700 From: Laxman Dewangan To: , CC: , , , , , , Laxman Dewangan Subject: [PATCH 18/20] mfd: tps65217: Use devm_mfd_add_devices() for mfd_device registration Date: Tue, 5 Apr 2016 17:18:30 +0530 Message-ID: <1459856912-17859-19-git-send-email-ldewangan@nvidia.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459856912-17859-1-git-send-email-ldewangan@nvidia.com> References: <1459856912-17859-1-git-send-email-ldewangan@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1390 Lines: 49 Use devm_mfd_add_devices() for mfd devices registration and get rid of .remove callback to remove mfd devices. This is done by managed device framework. Signed-off-by: Laxman Dewangan CC: Tony Lindgren --- drivers/mfd/tps65217.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c index d32b5442..25009da 100644 --- a/drivers/mfd/tps65217.c +++ b/drivers/mfd/tps65217.c @@ -205,7 +205,7 @@ static int tps65217_probe(struct i2c_client *client, return ret; } - ret = mfd_add_devices(tps->dev, -1, tps65217s, + ret = devm_mfd_add_devices(tps->dev, -1, tps65217s, ARRAY_SIZE(tps65217s), NULL, 0, NULL); if (ret < 0) { dev_err(tps->dev, "mfd_add_devices failed: %d\n", ret); @@ -235,15 +235,6 @@ static int tps65217_probe(struct i2c_client *client, return 0; } -static int tps65217_remove(struct i2c_client *client) -{ - struct tps65217 *tps = i2c_get_clientdata(client); - - mfd_remove_devices(tps->dev); - - return 0; -} - static const struct i2c_device_id tps65217_id_table[] = { {"tps65217", TPS65217}, { /* sentinel */ } @@ -257,7 +248,6 @@ static struct i2c_driver tps65217_driver = { }, .id_table = tps65217_id_table, .probe = tps65217_probe, - .remove = tps65217_remove, }; static int __init tps65217_init(void) -- 2.1.4