mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	hwmon: convert drivers/hwmon/* to use module_platform_driver()
This patch converts the drivers in drivers/hwmon/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler. Cc: Donggeun Kim <dg77.kim@samsung.com> Cc: Simon Guinot <sguinot@lacie.com> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Ben Dooks <ben@simtec.co.uk> Cc: Hans de Goede <hdegoede@redhat.com> Cc: J Keerthy <j-keerthy@ti.com> Cc: David S. Miller <davem@davemloft.net> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
		
							parent
							
								
									b52fabca36
								
							
						
					
					
						commit
						25a236a5db
					
				
					 11 changed files with 11 additions and 130 deletions
				
			
		| 
						 | 
					@ -506,17 +506,7 @@ static struct platform_driver exynos4_tmu_driver = {
 | 
				
			||||||
	.resume = exynos4_tmu_resume,
 | 
						.resume = exynos4_tmu_resume,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init exynos4_tmu_driver_init(void)
 | 
					module_platform_driver(exynos4_tmu_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_DESCRIPTION("EXYNOS4 TMU Driver");
 | 
					MODULE_DESCRIPTION("EXYNOS4 TMU Driver");
 | 
				
			||||||
MODULE_AUTHOR("Donggeun Kim <dg77.kim@samsung.com>");
 | 
					MODULE_AUTHOR("Donggeun Kim <dg77.kim@samsung.com>");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -539,18 +539,7 @@ static struct platform_driver gpio_fan_driver = {
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init gpio_fan_init(void)
 | 
					module_platform_driver(gpio_fan_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_AUTHOR("Simon Guinot <sguinot@lacie.com>");
 | 
					MODULE_AUTHOR("Simon Guinot <sguinot@lacie.com>");
 | 
				
			||||||
MODULE_DESCRIPTION("GPIO FAN driver");
 | 
					MODULE_DESCRIPTION("GPIO FAN driver");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -212,17 +212,7 @@ struct platform_driver jz4740_hwmon_driver = {
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init jz4740_hwmon_init(void)
 | 
					module_platform_driver(jz4740_hwmon_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_DESCRIPTION("JZ4740 SoC HWMON driver");
 | 
					MODULE_DESCRIPTION("JZ4740 SoC HWMON driver");
 | 
				
			||||||
MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 | 
					MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -432,19 +432,7 @@ static struct platform_driver ntc_thermistor_driver = {
 | 
				
			||||||
	.id_table = ntc_thermistor_id,
 | 
						.id_table = ntc_thermistor_id,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init ntc_thermistor_init(void)
 | 
					module_platform_driver(ntc_thermistor_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_DESCRIPTION("NTC Thermistor Driver");
 | 
					MODULE_DESCRIPTION("NTC Thermistor Driver");
 | 
				
			||||||
MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 | 
					MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -393,18 +393,7 @@ static struct platform_driver s3c_hwmon_driver = {
 | 
				
			||||||
	.remove		= __devexit_p(s3c_hwmon_remove),
 | 
						.remove		= __devexit_p(s3c_hwmon_remove),
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init s3c_hwmon_init(void)
 | 
					module_platform_driver(s3c_hwmon_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 | 
					MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 | 
				
			||||||
MODULE_DESCRIPTION("S3C ADC HWMon driver");
 | 
					MODULE_DESCRIPTION("S3C ADC HWMon driver");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -590,19 +590,8 @@ static struct platform_driver sch5627_driver = {
 | 
				
			||||||
	.remove		= sch5627_remove,
 | 
						.remove		= sch5627_remove,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init sch5627_init(void)
 | 
					module_platform_driver(sch5627_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	return platform_driver_register(&sch5627_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static void __exit sch5627_exit(void)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	platform_driver_unregister(&sch5627_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
MODULE_DESCRIPTION("SMSC SCH5627 Hardware Monitoring Driver");
 | 
					MODULE_DESCRIPTION("SMSC SCH5627 Hardware Monitoring Driver");
 | 
				
			||||||
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 | 
					MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 | 
				
			||||||
MODULE_LICENSE("GPL");
 | 
					MODULE_LICENSE("GPL");
 | 
				
			||||||
 | 
					 | 
				
			||||||
module_init(sch5627_init);
 | 
					 | 
				
			||||||
module_exit(sch5627_exit);
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -521,19 +521,8 @@ static struct platform_driver sch5636_driver = {
 | 
				
			||||||
	.remove		= sch5636_remove,
 | 
						.remove		= sch5636_remove,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init sch5636_init(void)
 | 
					module_platform_driver(sch5636_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	return platform_driver_register(&sch5636_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static void __exit sch5636_exit(void)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	platform_driver_unregister(&sch5636_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
MODULE_DESCRIPTION("SMSC SCH5636 Hardware Monitoring Driver");
 | 
					MODULE_DESCRIPTION("SMSC SCH5636 Hardware Monitoring Driver");
 | 
				
			||||||
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 | 
					MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
 | 
				
			||||||
MODULE_LICENSE("GPL");
 | 
					MODULE_LICENSE("GPL");
 | 
				
			||||||
 | 
					 | 
				
			||||||
module_init(sch5636_init);
 | 
					 | 
				
			||||||
module_exit(sch5636_exit);
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -136,19 +136,7 @@ static struct platform_driver twl4030_madc_hwmon_driver = {
 | 
				
			||||||
		   },
 | 
							   },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init twl4030_madc_hwmon_init(void)
 | 
					module_platform_driver(twl4030_madc_hwmon_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_DESCRIPTION("TWL4030 ADC Hwmon driver");
 | 
					MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver");
 | 
				
			||||||
MODULE_LICENSE("GPL");
 | 
					MODULE_LICENSE("GPL");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -309,15 +309,4 @@ static struct platform_driver env_driver = {
 | 
				
			||||||
	.remove		= __devexit_p(env_remove),
 | 
						.remove		= __devexit_p(env_remove),
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init env_init(void)
 | 
					module_platform_driver(env_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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);
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -209,17 +209,7 @@ static struct platform_driver wm831x_hwmon_driver = {
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init wm831x_hwmon_init(void)
 | 
					module_platform_driver(wm831x_hwmon_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 | 
					MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 | 
				
			||||||
MODULE_DESCRIPTION("WM831x Hardware Monitoring");
 | 
					MODULE_DESCRIPTION("WM831x Hardware Monitoring");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -133,17 +133,7 @@ static struct platform_driver wm8350_hwmon_driver = {
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init wm8350_hwmon_init(void)
 | 
					module_platform_driver(wm8350_hwmon_driver);
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	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_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 | 
					MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 | 
				
			||||||
MODULE_DESCRIPTION("WM8350 Hardware Monitoring");
 | 
					MODULE_DESCRIPTION("WM8350 Hardware Monitoring");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue