mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

base/platform: Simplifications for NULL platform data/resources handling

Browse source 
There's no need to explicitly check for data and resources being NULL,
as platform_device_add_{data,resources}() do this internally nowadays.

This makes the code more linear and less indented.

Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Anton Vorontsov 2010-09-07 17:31:54 +04:00 committed by Greg Kroah-Hartman
parent 5cfc64ceb6
commit 807508c8ff
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/base/platform.c
View file

@ -380,17 +380,13 @@ struct platform_device *__init_or_module platform_device_register_resndata(
pdev->dev.parent = parent;
if (res) {
ret = platform_device_add_resources(pdev, res, num);
if (ret)
goto err;
}
ret = platform_device_add_resources(pdev, res, num);
if (ret)
goto err;
if (data) {
ret = platform_device_add_data(pdev, data, size);
if (ret)
goto err;
}
ret = platform_device_add_data(pdev, data, size);
if (ret)
goto err;
ret = platform_device_add(pdev);
if (ret) {
@ -537,17 +533,13 @@ struct platform_device * __init_or_module platform_create_bundle(
goto err_out;
}
if (res) {
error = platform_device_add_resources(pdev, res, n_res);
if (error)
goto err_pdev_put;
}
error = platform_device_add_resources(pdev, res, n_res);
if (error)
goto err_pdev_put;
if (data) {
error = platform_device_add_data(pdev, data, size);
if (error)
goto err_pdev_put;
}
error = platform_device_add_data(pdev, data, size);
if (error)
goto err_pdev_put;
error = platform_device_add(pdev);
if (error)