Commit d3bff627 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-misc' 

Merge thermal control changes related to switching over platform drivers
to using void remove callbacks.

* thermal-misc: (31 commits)
  thermal: amlogic: Convert to platform remove callback returning void
  thermal: uniphier: Convert to platform remove callback returning void
  thermal: ti-bandgap: Convert to platform remove callback returning void
  thermal: tegra-bpmp: Convert to platform remove callback returning void
  thermal: soctherm: Convert to platform remove callback returning void
  thermal: stm: Convert to platform remove callback returning void
  thermal: sprd: Convert to platform remove callback returning void
  thermal: spear: Convert to platform remove callback returning void
  thermal: exynos_tmu: Convert to platform remove callback returning void
  thermal: rzg2l: Convert to platform remove callback returning void
  thermal: rockchip: Convert to platform remove callback returning void
  thermal: rcar: Convert to platform remove callback returning void
  thermal: rcar_gen3: Convert to platform remove callback returning void
  thermal: tsens: Convert to platform remove callback returning void
  thermal: lvts: Convert to platform remove callback returning void
  thermal: kirkwood: Convert to platform remove callback returning void
  thermal: k3_j72xx_bandgap: Convert to platform remove callback returning void
  thermal: k3_bandgap: Convert to platform remove callback returning void
  thermal: int3406: Convert to platform remove callback returning void
  thermal: int3403: Convert to platform remove callback returning void
  ...
parents c9962609 eea6c262

drivers/thermal/amlogic_thermal.c

+4 −4
Original line number Diff line number Diff line
@@ -291,11 +291,11 @@ static int amlogic_thermal_probe(struct platform_device *pdev) 
	return ret;

}



static int amlogic_thermal_remove(struct platform_device *pdev)

static void amlogic_thermal_remove(struct platform_device *pdev)

{

	struct amlogic_thermal *data = platform_get_drvdata(pdev);



	return amlogic_thermal_disable(data);

	amlogic_thermal_disable(data);

}



static int __maybe_unused amlogic_thermal_suspend(struct device *dev)
@@ -322,7 +322,7 @@ static struct platform_driver amlogic_thermal_driver = { 
		.of_match_table = of_amlogic_thermal_match,

	},

	.probe = amlogic_thermal_probe,

	.remove	= amlogic_thermal_remove,

	.remove_new = amlogic_thermal_remove,

};



module_platform_driver(amlogic_thermal_driver);

drivers/thermal/armada_thermal.c

+2 −4
Original line number Diff line number Diff line
@@ -965,19 +965,17 @@ static int armada_thermal_probe(struct platform_device *pdev) 
	return 0;

}



static int armada_thermal_exit(struct platform_device *pdev)

static void armada_thermal_exit(struct platform_device *pdev)

{

	struct armada_drvdata *drvdata = platform_get_drvdata(pdev);



	if (drvdata->type == LEGACY)

		thermal_zone_device_unregister(drvdata->data.tz);



	return 0;

}



static struct platform_driver armada_thermal_driver = {

	.probe = armada_thermal_probe,

	.remove = armada_thermal_exit,

	.remove_new = armada_thermal_exit,

	.driver = {

		.name = "armada_thermal",

		.of_match_table = armada_thermal_id_table,

drivers/thermal/broadcom/bcm2835_thermal.c

+2 −4
Original line number Diff line number Diff line
@@ -282,19 +282,17 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) 
	return err;

}



static int bcm2835_thermal_remove(struct platform_device *pdev)

static void bcm2835_thermal_remove(struct platform_device *pdev)

{

	struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);



	debugfs_remove_recursive(data->debugfsdir);

	clk_disable_unprepare(data->clk);



	return 0;

}



static struct platform_driver bcm2835_thermal_driver = {

	.probe = bcm2835_thermal_probe,

	.remove = bcm2835_thermal_remove,

	.remove_new = bcm2835_thermal_remove,

	.driver = {

		.name = "bcm2835_thermal",

		.of_match_table = bcm2835_thermal_of_match_table,

drivers/thermal/broadcom/ns-thermal.c

+2 −4
Original line number Diff line number Diff line
@@ -65,13 +65,11 @@ static int ns_thermal_probe(struct platform_device *pdev) 
	return 0;

}



static int ns_thermal_remove(struct platform_device *pdev)

static void ns_thermal_remove(struct platform_device *pdev)

{

	void __iomem *pvtmon = platform_get_drvdata(pdev);



	iounmap(pvtmon);



	return 0;

}



static const struct of_device_id ns_thermal_of_match[] = {
@@ -82,7 +80,7 @@ MODULE_DEVICE_TABLE(of, ns_thermal_of_match); 


static struct platform_driver ns_thermal_driver = {

	.probe		= ns_thermal_probe,

	.remove		= ns_thermal_remove,

	.remove_new	= ns_thermal_remove,

	.driver = {

		.name = "ns-thermal",

		.of_match_table = ns_thermal_of_match,

drivers/thermal/da9062-thermal.c

+2 −3
Original line number Diff line number Diff line
@@ -239,19 +239,18 @@ static int da9062_thermal_probe(struct platform_device *pdev) 
	return ret;

}



static int da9062_thermal_remove(struct platform_device *pdev)

static void da9062_thermal_remove(struct platform_device *pdev)

{

	struct	da9062_thermal *thermal = platform_get_drvdata(pdev);



	free_irq(thermal->irq, thermal);

	cancel_delayed_work_sync(&thermal->work);

	thermal_zone_device_unregister(thermal->zone);

	return 0;

}



static struct platform_driver da9062_thermal_driver = {

	.probe	= da9062_thermal_probe,

	.remove	= da9062_thermal_remove,

	.remove_new = da9062_thermal_remove,

	.driver	= {

		.name	= "da9062-thermal",

		.of_match_table = da9062_compatible_reg_id_table,