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

Commit 0e500b6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of... 

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: convert drivers/hwmon/* to use module_platform_driver()
  hwmon: Remove redundant spi driver bus initialization
parents 8748dfae 25a236a5

drivers/hwmon/ad7314.c

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ MODULE_DEVICE_TABLE(spi, ad7314_id); 
static struct spi_driver ad7314_driver = {

	.driver = {

		.name = "ad7314",

		.bus = &spi_bus_type,

		.owner = THIS_MODULE,

	},

	.probe = ad7314_probe,

drivers/hwmon/ads7871.c

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static int __devexit ads7871_remove(struct spi_device *spi) 
static struct spi_driver ads7871_driver = {

	.driver = {

		.name = DEVICE_NAME,

		.bus = &spi_bus_type,

		.owner = THIS_MODULE,

	},

drivers/hwmon/exynos4_tmu.c

+1 −11
Original line number Diff line number Diff line
@@ -506,17 +506,7 @@ static struct platform_driver exynos4_tmu_driver = { 
	.resume = exynos4_tmu_resume,

};



static int __init exynos4_tmu_driver_init(void)

{

	return platform_driver_register(&exynos4_tmu_driver);

}

module_init(exynos4_tmu_driver_init);



static void __exit exynos4_tmu_driver_exit(void)

{

	platform_driver_unregister(&exynos4_tmu_driver);

}

module_exit(exynos4_tmu_driver_exit);

module_platform_driver(exynos4_tmu_driver);



MODULE_DESCRIPTION("EXYNOS4 TMU Driver");

MODULE_AUTHOR("Donggeun Kim <dg77.kim@samsung.com>");

drivers/hwmon/gpio-fan.c

+1 −12
Original line number Diff line number Diff line
@@ -539,18 +539,7 @@ static struct platform_driver gpio_fan_driver = { 
	},

};



static int __init gpio_fan_init(void)

{

	return platform_driver_register(&gpio_fan_driver);

}



static void __exit gpio_fan_exit(void)

{

	platform_driver_unregister(&gpio_fan_driver);

}



module_init(gpio_fan_init);

module_exit(gpio_fan_exit);

module_platform_driver(gpio_fan_driver);



MODULE_AUTHOR("Simon Guinot <sguinot@lacie.com>");

MODULE_DESCRIPTION("GPIO FAN driver");

drivers/hwmon/jz4740-hwmon.c

+1 −11
Original line number Diff line number Diff line
@@ -212,17 +212,7 @@ struct platform_driver jz4740_hwmon_driver = { 
	},

};



static int __init jz4740_hwmon_init(void)

{

	return platform_driver_register(&jz4740_hwmon_driver);

}

module_init(jz4740_hwmon_init);



static void __exit jz4740_hwmon_exit(void)

{

	platform_driver_unregister(&jz4740_hwmon_driver);

}

module_exit(jz4740_hwmon_exit);

module_platform_driver(jz4740_hwmon_driver);



MODULE_DESCRIPTION("JZ4740 SoC HWMON driver");

MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");