iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base/platform: Remove code duplication

Browse Source 
Failure path of platform_device_add was almost the same as
platform_device_del. Refactor same code in a function.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ricardo Ribalda Delgado 2015-05-26 09:31:26 +02:00 committed by Greg Kroah-Hartman
parent b6d2233f29
commit 6d9d4b1469
1 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/base/platform.c
View File

@ -298,6 +298,25 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
} }
EXPORT_SYMBOL_GPL(platform_device_add_data); EXPORT_SYMBOL_GPL(platform_device_add_data);
static void platform_device_cleanout(struct platform_device *pdev, int n_res)
{
int i;
if (pdev->id_auto) {
ida_simple_remove(&platform_devid_ida, pdev->id);
pdev->id = PLATFORM_DEVID_AUTO;
}
for (i = 0; i < n_res; i++) {
struct resource *r = &pdev->resource[i];
unsigned long type = resource_type(r);
if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
r->parent)
release_resource(r);
}
}
/** /**
* platform_device_add - add a platform device to device hierarchy * platform_device_add - add a platform device to device hierarchy
* @pdev: platform device we're adding * @pdev: platform device we're adding
@ -371,23 +390,8 @@ int platform_device_add(struct platform_device *pdev)
dev_name(&pdev->dev), dev_name(pdev->dev.parent)); dev_name(&pdev->dev), dev_name(pdev->dev.parent));
ret = device_add(&pdev->dev); ret = device_add(&pdev->dev);
if (ret == 0) if (ret)
return ret; platform_device_cleanout(pdev, i);
/* Failure path */
if (pdev->id_auto) {
ida_simple_remove(&platform_devid_ida, pdev->id);
pdev->id = PLATFORM_DEVID_AUTO;
}
while (--i >= 0) {
struct resource *r = &pdev->resource[i];
unsigned long type = resource_type(r);
if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
r->parent)
release_resource(r);
}
return ret; return ret;
} }
@ -403,25 +407,11 @@ EXPORT_SYMBOL_GPL(platform_device_add);
*/ */
void platform_device_del(struct platform_device *pdev) void platform_device_del(struct platform_device *pdev)
{ {
int i; if (!pdev)
return;
if (pdev) { device_del(&pdev->dev);
device_del(&pdev->dev); platform_device_cleanout(pdev, pdev->num_resources);
if (pdev->id_auto) {
ida_simple_remove(&platform_devid_ida, pdev->id);
pdev->id = PLATFORM_DEVID_AUTO;
}
for (i = 0; i < pdev->num_resources; i++) {
struct resource *r = &pdev->resource[i];
unsigned long type = resource_type(r);
if ((type == IORESOURCE_MEM || type == IORESOURCE_IO) &&
r->parent)
release_resource(r);
}
}
} }
EXPORT_SYMBOL_GPL(platform_device_del); EXPORT_SYMBOL_GPL(platform_device_del);