Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-11-28 19:28:32 -08:00
commit 0e500b6d23
13 changed files with 11 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hwmon/ad7314.c
View File

@ -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,

1
drivers/hwmon/ads7871.c
View File

@ -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,
},

12
drivers/hwmon/exynos4_tmu.c
View File

@ -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>");

13
drivers/hwmon/gpio-fan.c
View File

@ -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");

12
drivers/hwmon/jz4740-hwmon.c
View File

@ -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>");

14
drivers/hwmon/ntc_thermistor.c
View File

@ -432,19 +432,7 @@ static struct platform_driver ntc_thermistor_driver = {
.id_table = ntc_thermistor_id,
};
static int __init ntc_thermistor_init(void)
{
return platform_driver_register(&ntc_thermistor_driver);
}
module_init(ntc_thermistor_init);
static void __exit ntc_thermistor_cleanup(void)
{
platform_driver_unregister(&ntc_thermistor_driver);
}
module_exit(ntc_thermistor_cleanup);
module_platform_driver(ntc_thermistor_driver);
MODULE_DESCRIPTION("NTC Thermistor Driver");
MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");

13
drivers/hwmon/s3c-hwmon.c
View File

@ -393,18 +393,7 @@ static struct platform_driver s3c_hwmon_driver = {
.remove = __devexit_p(s3c_hwmon_remove),
};
static int __init s3c_hwmon_init(void)
{
return platform_driver_register(&s3c_hwmon_driver);
}
static void __exit s3c_hwmon_exit(void)
{
platform_driver_unregister(&s3c_hwmon_driver);
}
module_init(s3c_hwmon_init);
module_exit(s3c_hwmon_exit);
module_platform_driver(s3c_hwmon_driver);
MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
MODULE_DESCRIPTION("S3C ADC HWMon driver");

13
drivers/hwmon/sch5627.c
View File

@ -590,19 +590,8 @@ static struct platform_driver sch5627_driver = {
.remove = sch5627_remove,
};
static int __init sch5627_init(void)
{
return platform_driver_register(&sch5627_driver);
}
static void __exit sch5627_exit(void)
{
platform_driver_unregister(&sch5627_driver);
}
module_platform_driver(sch5627_driver);
MODULE_DESCRIPTION("SMSC SCH5627 Hardware Monitoring Driver");
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
MODULE_LICENSE("GPL");
module_init(sch5627_init);
module_exit(sch5627_exit);

13
drivers/hwmon/sch5636.c
View File

@ -521,19 +521,8 @@ static struct platform_driver sch5636_driver = {
.remove = sch5636_remove,
};
static int __init sch5636_init(void)
{
return platform_driver_register(&sch5636_driver);
}
static void __exit sch5636_exit(void)
{
platform_driver_unregister(&sch5636_driver);
}
module_platform_driver(sch5636_driver);
MODULE_DESCRIPTION("SMSC SCH5636 Hardware Monitoring Driver");
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
MODULE_LICENSE("GPL");
module_init(sch5636_init);
module_exit(sch5636_exit);

14
drivers/hwmon/twl4030-madc-hwmon.c
View File

@ -136,19 +136,7 @@ static struct platform_driver twl4030_madc_hwmon_driver = {
},
};
static int __init twl4030_madc_hwmon_init(void)
{
return platform_driver_register(&twl4030_madc_hwmon_driver);
}
module_init(twl4030_madc_hwmon_init);
static void __exit twl4030_madc_hwmon_exit(void)
{
platform_driver_unregister(&twl4030_madc_hwmon_driver);
}
module_exit(twl4030_madc_hwmon_exit);
module_platform_driver(twl4030_madc_hwmon_driver);
MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver");
MODULE_LICENSE("GPL");

13
drivers/hwmon/ultra45_env.c
View File

@ -309,15 +309,4 @@ static struct platform_driver env_driver = {
.remove = __devexit_p(env_remove),
};
static int __init env_init(void)
{
return platform_driver_register(&env_driver);
}
static void __exit env_exit(void)
{
platform_driver_unregister(&env_driver);
}
module_init(env_init);
module_exit(env_exit);
module_platform_driver(env_driver);

12
drivers/hwmon/wm831x-hwmon.c
View File

@ -209,17 +209,7 @@ static struct platform_driver wm831x_hwmon_driver = {
},
};
static int __init wm831x_hwmon_init(void)
{
return platform_driver_register(&wm831x_hwmon_driver);
}
module_init(wm831x_hwmon_init);
static void __exit wm831x_hwmon_exit(void)
{
platform_driver_unregister(&wm831x_hwmon_driver);
}
module_exit(wm831x_hwmon_exit);
module_platform_driver(wm831x_hwmon_driver);
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_DESCRIPTION("WM831x Hardware Monitoring");

12
drivers/hwmon/wm8350-hwmon.c
View File

@ -133,17 +133,7 @@ static struct platform_driver wm8350_hwmon_driver = {
},
};
static int __init wm8350_hwmon_init(void)
{
return platform_driver_register(&wm8350_hwmon_driver);
}
module_init(wm8350_hwmon_init);
static void __exit wm8350_hwmon_exit(void)
{
platform_driver_unregister(&wm8350_hwmon_driver);
}
module_exit(wm8350_hwmon_exit);
module_platform_driver(wm8350_hwmon_driver);
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_DESCRIPTION("WM8350 Hardware Monitoring");