Commit cabb33dd authored by Chen-Yu Tsai's avatar Chen-Yu Tsai
Browse files

Merge remote-tracking branch 'mfd/ib-mfd-bus-5.12' into sunxi/drivers-for-5.12

parents 4a0dbc12 3c15e00e

drivers/bus/sunxi-rsb.c

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ static int sunxi_rsb_device_remove(struct device *dev) 
{

	const struct sunxi_rsb_driver *drv = to_sunxi_rsb_driver(dev->driver);



	return drv->remove(to_sunxi_rsb_device(dev));

	drv->remove(to_sunxi_rsb_device(dev));



	return 0;

}



static struct bus_type sunxi_rsb_bus = {

drivers/mfd/axp20x-i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ static int axp20x_i2c_remove(struct i2c_client *i2c) 
{

	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);



	return axp20x_device_remove(axp20x);

	axp20x_device_remove(axp20x);



	return 0;

}



#ifdef CONFIG_OF

drivers/mfd/axp20x-rsb.c

+2 −2
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev) 
	return axp20x_device_probe(axp20x);

}



static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)

static void axp20x_rsb_remove(struct sunxi_rsb_device *rdev)

{

	struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);



	return axp20x_device_remove(axp20x);

	axp20x_device_remove(axp20x);

}



static const struct of_device_id axp20x_rsb_of_match[] = {

drivers/mfd/axp20x.c

+1 −3
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ int axp20x_device_probe(struct axp20x_dev *axp20x) 
}

EXPORT_SYMBOL(axp20x_device_probe);



int axp20x_device_remove(struct axp20x_dev *axp20x)

void axp20x_device_remove(struct axp20x_dev *axp20x)

{

	if (axp20x == axp20x_pm_power_off) {

		axp20x_pm_power_off = NULL;
@@ -996,8 +996,6 @@ int axp20x_device_remove(struct axp20x_dev *axp20x) 


	mfd_remove_devices(axp20x->dev);

	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);



	return 0;

}

EXPORT_SYMBOL(axp20x_device_remove);

include/linux/mfd/axp20x.h

+1 −1
Original line number Diff line number Diff line
@@ -696,6 +696,6 @@ int axp20x_device_probe(struct axp20x_dev *axp20x); 
 *

 * This tells the axp20x core to remove the associated mfd devices

 */

int axp20x_device_remove(struct axp20x_dev *axp20x);

void axp20x_device_remove(struct axp20x_dev *axp20x);



#endif /* __LINUX_MFD_AXP20X_H */