Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932939AbcDEMFX (ORCPT ); Tue, 5 Apr 2016 08:05:23 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:8148 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758297AbcDEMAV (ORCPT ); Tue, 5 Apr 2016 08:00:21 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Tue, 05 Apr 2016 04:58:52 -0700 From: Laxman Dewangan To: , CC: , , , , , , Laxman Dewangan , Florian Fainelli Subject: [PATCH 11/20] mfd: rdc321x: Use devm_mfd_add_devices() for mfd_device registration Date: Tue, 5 Apr 2016 17:18:23 +0530 Message-ID: <1459856912-17859-12-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: 1338 Lines: 42 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: Florian Fainelli --- drivers/mfd/rdc321x-southbridge.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c index 6575585..3ddb644 100644 --- a/drivers/mfd/rdc321x-southbridge.c +++ b/drivers/mfd/rdc321x-southbridge.c @@ -85,16 +85,11 @@ static int rdc321x_sb_probe(struct pci_dev *pdev, rdc321x_gpio_pdata.sb_pdev = pdev; rdc321x_wdt_pdata.sb_pdev = pdev; - return mfd_add_devices(&pdev->dev, -1, + return devm_mfd_add_devices(&pdev->dev, -1, rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), NULL, 0, NULL); } -static void rdc321x_sb_remove(struct pci_dev *pdev) -{ - mfd_remove_devices(&pdev->dev); -} - static const struct pci_device_id rdc321x_sb_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) }, {} @@ -105,7 +100,6 @@ static struct pci_driver rdc321x_sb_driver = { .name = "RDC321x Southbridge", .id_table = rdc321x_sb_table, .probe = rdc321x_sb_probe, - .remove = rdc321x_sb_remove, }; module_pci_driver(rdc321x_sb_driver); -- 2.1.4