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

Commit dcb0574b authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files

mfd: wm831x: Remove redundant !pdata checks 



Since a copy of the pdata was added into the core struct in
commit f6dd8449 ("mfd: wm831x: Add basic device tree binding")
the pdata pointer in probe can no longer be NULL. As such remove
the redundant checks for this case.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6ae0cc90

drivers/mfd/wm831x-core.c

+12 −14
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
	}

	wm831x->locked = 1;



	if (pdata && pdata->pre_init) {

	if (pdata->pre_init) {

		ret = pdata->pre_init(wm831x);

		if (ret != 0) {

			dev_err(wm831x->dev, "pre_init() failed: %d\n", ret);
@@ -1774,7 +1774,6 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
		}

	}



	if (pdata) {

	for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) {

		if (!pdata->gpio_defaults[i])

			continue;
@@ -1783,10 +1782,9 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
				 WM831X_GPIO1_CONTROL + i,

				 pdata->gpio_defaults[i] & 0xffff);

	}

	}



	/* Multiply by 10 as we have many subdevices of the same type */

	if (pdata && pdata->wm831x_num)

	if (pdata->wm831x_num)

		wm831x_num = pdata->wm831x_num * 10;

	else

		wm831x_num = -1;
@@ -1809,7 +1807,7 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
		ret = mfd_add_devices(wm831x->dev, wm831x_num,

				      wm8311_devs, ARRAY_SIZE(wm8311_devs),

				      NULL, 0, NULL);

		if (!pdata || !pdata->disable_touch)

		if (!pdata->disable_touch)

			mfd_add_devices(wm831x->dev, wm831x_num,

					touch_devs, ARRAY_SIZE(touch_devs),

					NULL, 0, NULL);
@@ -1819,7 +1817,7 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
		ret = mfd_add_devices(wm831x->dev, wm831x_num,

				      wm8312_devs, ARRAY_SIZE(wm8312_devs),

				      NULL, 0, NULL);

		if (!pdata || !pdata->disable_touch)

		if (!pdata->disable_touch)

			mfd_add_devices(wm831x->dev, wm831x_num,

					touch_devs, ARRAY_SIZE(touch_devs),

					NULL, 0, NULL);
@@ -1865,7 +1863,7 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 
		dev_info(wm831x->dev, "32.768kHz clock disabled, no RTC\n");

	}



	if (pdata && pdata->backlight) {

	if (pdata->backlight) {

		/* Treat errors as non-critical */

		ret = mfd_add_devices(wm831x->dev, wm831x_num, backlight_devs,

				      ARRAY_SIZE(backlight_devs), NULL,
@@ -1877,7 +1875,7 @@ int wm831x_device_init(struct wm831x *wm831x, int irq) 


	wm831x_otp_init(wm831x);



	if (pdata && pdata->post_init) {

	if (pdata->post_init) {

		ret = pdata->post_init(wm831x);

		if (ret != 0) {

			dev_err(wm831x->dev, "post_init() failed: %d\n", ret);