diff options
Diffstat (limited to 'drivers/mfd/wm831x-core.c')
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 946698fd2dc..30173103594 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c @@ -1813,27 +1813,27 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)  	case WM8310:  		ret = mfd_add_devices(wm831x->dev, wm831x_num,  				      wm8310_devs, ARRAY_SIZE(wm8310_devs), -				      NULL, 0); +				      NULL, 0, NULL);  		break;  	case WM8311:  		ret = mfd_add_devices(wm831x->dev, wm831x_num,  				      wm8311_devs, ARRAY_SIZE(wm8311_devs), -				      NULL, 0); +				      NULL, 0, NULL);  		if (!pdata || !pdata->disable_touch)  			mfd_add_devices(wm831x->dev, wm831x_num,  					touch_devs, ARRAY_SIZE(touch_devs), -					NULL, 0); +					NULL, 0, NULL);  		break;  	case WM8312:  		ret = mfd_add_devices(wm831x->dev, wm831x_num,  				      wm8312_devs, ARRAY_SIZE(wm8312_devs), -				      NULL, 0); +				      NULL, 0, NULL);  		if (!pdata || !pdata->disable_touch)  			mfd_add_devices(wm831x->dev, wm831x_num,  					touch_devs, ARRAY_SIZE(touch_devs), -					NULL, 0); +					NULL, 0, NULL);  		break;  	case WM8320: @@ -1842,7 +1842,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)  	case WM8326:  		ret = mfd_add_devices(wm831x->dev, wm831x_num,  				      wm8320_devs, ARRAY_SIZE(wm8320_devs), -				      NULL, 0); +				      NULL, 0, NULL);  		break;  	default: @@ -1867,7 +1867,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)  	if (ret & WM831X_XTAL_ENA) {  		ret = mfd_add_devices(wm831x->dev, wm831x_num,  				      rtc_devs, ARRAY_SIZE(rtc_devs), -				      NULL, 0); +				      NULL, 0, NULL);  		if (ret != 0) {  			dev_err(wm831x->dev, "Failed to add RTC: %d\n", ret);  			goto err_irq; @@ -1880,7 +1880,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)  		/* Treat errors as non-critical */  		ret = mfd_add_devices(wm831x->dev, wm831x_num, backlight_devs,  				      ARRAY_SIZE(backlight_devs), NULL, -				      0); +				      0, NULL);  		if (ret < 0)  			dev_err(wm831x->dev, "Failed to add backlight: %d\n",  				ret);  |