Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29090265 authored by Markus Elfring's avatar Markus Elfring Committed by Lee Jones
Browse files

mfd: dm355evm_msp: Refactoring for add_child() 

Adjust jump targets according to the Linux coding style convention.
Another check for the variable "status" can be omitted then at the end.

Link: https://lkml.kernel.org/g/<20160628163146.GG29166@dell

>
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 8dcc5ff8

drivers/mfd/dm355evm_msp.c

+9 −8
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static struct device *add_child(struct i2c_client *client, const char *name, 
		status = platform_device_add_data(pdev, pdata, pdata_len);

		if (status < 0) {

			dev_dbg(&pdev->dev, "can't add platform_data\n");

			goto err;

			goto put_device;

		}

	}
@@ -222,20 +222,21 @@ static struct device *add_child(struct i2c_client *client, const char *name, 
		status = platform_device_add_resources(pdev, &r, 1);

		if (status < 0) {

			dev_dbg(&pdev->dev, "can't add irq\n");

			goto err;

			goto put_device;

		}

	}



	status = platform_device_add(pdev);

	if (status)

		goto put_device;



err:

	if (status < 0) {

	return &pdev->dev;



put_device:

	platform_device_put(pdev);

		dev_err(&client->dev, "can't add %s dev\n", name);

	dev_err(&client->dev, "failed to add device %s\n", name);

	return ERR_PTR(status);

}

	return &pdev->dev;

}



static int add_children(struct i2c_client *client)

{