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

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

mfd: twl-core: Refactoring for add_numbered_child() 



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

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

drivers/mfd/twl-core.c

+11 −10
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ add_numbered_child(unsigned mod_no, const char *name, int num, 
		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;

		}

	}
@@ -644,22 +644,23 @@ add_numbered_child(unsigned mod_no, const char *name, int num, 
		status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1);

		if (status < 0) {

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

			goto err;

			goto put_device;

		}

	}



	status = platform_device_add(pdev);

	if (status == 0)

	if (status)

		goto put_device;



	device_init_wakeup(&pdev->dev, can_wakeup);



err:

	if (status < 0) {

	return &pdev->dev;



put_device:

	platform_device_put(pdev);

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

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

	return ERR_PTR(status);

}

	return &pdev->dev;

}



static inline struct device *add_child(unsigned mod_no, const char *name,

		void *pdata, unsigned pdata_len,