Skip to contentSkip to conversation

mfd: lpc_sch: don't call mfd_remove_devices()

PATCH Applied Andy Shevchenko 2 participants 2 messages Nov 3, 2014 – Nov 4, 2014 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: lpc_sch: don't call mfd_remove_devices()

MFD core already cares about failing registration. It will remove successfully registered devices in case of error. Thus, no need to repeatedly call mfd_remove_devices().

Fixes 5829e9b64e65 (mfd: lpc_sch: Accomodate partial population of the MFD devices)
---
 drivers/mfd/lpc_sch.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mfd/lpc_sch.c +1 -5
index c980da4..5c38df3 100644
@@ -193,11 +193,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		return -ENODEV;
 	}
 
-	ret = mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
-	if (ret)
-		mfd_remove_devices(&dev->dev);
-
-	return ret;
+	return mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
 }
 
 static void lpc_sch_remove(struct pci_dev *dev)
Signature · 1 line
2.1.1
Applied
#1 lore raw
Quoted 9 lines · Andy Shevchenko

MFD core already cares about failing registration. It will remove successfully registered devices in case of error. Thus, no need to repeatedly call mfd_remove_devices().

Fixes 5829e9b64e65 (mfd: lpc_sch: Accomodate partial population of the MFD devices)
---
 drivers/mfd/lpc_sch.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Applied, thanks.

Quoted 17 lines
drivers/mfd/lpc_sch.c +1 -5
index c980da4..5c38df3 100644
@@ -193,11 +193,7 @@ static int lpc_sch_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		return -ENODEV;
 	}
 
-	ret = mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
-	if (ret)
-		mfd_remove_devices(&dev->dev);
-
-	return ret;
+	return mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
 }
 
 static void lpc_sch_remove(struct pci_dev *dev)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog