Commit 1850514b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Drivers: clocksource: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 163247c1
...@@ -73,7 +73,7 @@ static struct clocksource clocksource_acpi_pm = { ...@@ -73,7 +73,7 @@ static struct clocksource clocksource_acpi_pm = {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinitdata acpi_pm_good; static int acpi_pm_good;
static int __init acpi_pm_good_setup(char *__str) static int __init acpi_pm_good_setup(char *__str)
{ {
acpi_pm_good = 1; acpi_pm_good = 1;
...@@ -102,7 +102,7 @@ static inline void acpi_pm_need_workaround(void) ...@@ -102,7 +102,7 @@ static inline void acpi_pm_need_workaround(void)
* incorrect when read). As a result, the ACPI free running count up * incorrect when read). As a result, the ACPI free running count up
* timer specification is violated due to erroneous reads. * timer specification is violated due to erroneous reads.
*/ */
static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev) static void acpi_pm_check_blacklist(struct pci_dev *dev)
{ {
if (acpi_pm_good) if (acpi_pm_good)
return; return;
...@@ -120,7 +120,7 @@ static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev) ...@@ -120,7 +120,7 @@ static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev)
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
acpi_pm_check_blacklist); acpi_pm_check_blacklist);
static void __devinit acpi_pm_check_graylist(struct pci_dev *dev) static void acpi_pm_check_graylist(struct pci_dev *dev)
{ {
if (acpi_pm_good) if (acpi_pm_good)
return; return;
......
...@@ -311,7 +311,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p) ...@@ -311,7 +311,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p)
clockevents_config_and_register(ced, 1, 2, 0xffffffff); clockevents_config_and_register(ced, 1, 2, 0xffffffff);
} }
static int __devinit em_sti_probe(struct platform_device *pdev) static int em_sti_probe(struct platform_device *pdev)
{ {
struct em_sti_priv *p; struct em_sti_priv *p;
struct resource *res; struct resource *res;
...@@ -379,12 +379,12 @@ static int __devinit em_sti_probe(struct platform_device *pdev) ...@@ -379,12 +379,12 @@ static int __devinit em_sti_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit em_sti_remove(struct platform_device *pdev) static int em_sti_remove(struct platform_device *pdev)
{ {
return -EBUSY; /* cannot unregister clockevent and clocksource */ return -EBUSY; /* cannot unregister clockevent and clocksource */
} }
static const struct of_device_id em_sti_dt_ids[] __devinitconst = { static const struct of_device_id em_sti_dt_ids[] = {
{ .compatible = "renesas,em-sti", }, { .compatible = "renesas,em-sti", },
{}, {},
}; };
...@@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(of, em_sti_dt_ids); ...@@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(of, em_sti_dt_ids);
static struct platform_driver em_sti_device_driver = { static struct platform_driver em_sti_device_driver = {
.probe = em_sti_probe, .probe = em_sti_probe,
.remove = __devexit_p(em_sti_remove), .remove = em_sti_remove,
.driver = { .driver = {
.name = "em_sti", .name = "em_sti",
.of_match_table = em_sti_dt_ids, .of_match_table = em_sti_dt_ids,
......
...@@ -726,7 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) ...@@ -726,7 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
return ret; return ret;
} }
static int __devinit sh_cmt_probe(struct platform_device *pdev) static int sh_cmt_probe(struct platform_device *pdev)
{ {
struct sh_cmt_priv *p = platform_get_drvdata(pdev); struct sh_cmt_priv *p = platform_get_drvdata(pdev);
struct sh_timer_config *cfg = pdev->dev.platform_data; struct sh_timer_config *cfg = pdev->dev.platform_data;
...@@ -767,14 +767,14 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev) ...@@ -767,14 +767,14 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit sh_cmt_remove(struct platform_device *pdev) static int sh_cmt_remove(struct platform_device *pdev)
{ {
return -EBUSY; /* cannot unregister clockevent and clocksource */ return -EBUSY; /* cannot unregister clockevent and clocksource */
} }
static struct platform_driver sh_cmt_device_driver = { static struct platform_driver sh_cmt_device_driver = {
.probe = sh_cmt_probe, .probe = sh_cmt_probe,
.remove = __devexit_p(sh_cmt_remove), .remove = sh_cmt_remove,
.driver = { .driver = {
.name = "sh_cmt", .name = "sh_cmt",
} }
......
...@@ -321,7 +321,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) ...@@ -321,7 +321,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
return ret; return ret;
} }
static int __devinit sh_mtu2_probe(struct platform_device *pdev) static int sh_mtu2_probe(struct platform_device *pdev)
{ {
struct sh_mtu2_priv *p = platform_get_drvdata(pdev); struct sh_mtu2_priv *p = platform_get_drvdata(pdev);
struct sh_timer_config *cfg = pdev->dev.platform_data; struct sh_timer_config *cfg = pdev->dev.platform_data;
...@@ -362,14 +362,14 @@ static int __devinit sh_mtu2_probe(struct platform_device *pdev) ...@@ -362,14 +362,14 @@ static int __devinit sh_mtu2_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit sh_mtu2_remove(struct platform_device *pdev) static int sh_mtu2_remove(struct platform_device *pdev)
{ {
return -EBUSY; /* cannot unregister clockevent */ return -EBUSY; /* cannot unregister clockevent */
} }
static struct platform_driver sh_mtu2_device_driver = { static struct platform_driver sh_mtu2_device_driver = {
.probe = sh_mtu2_probe, .probe = sh_mtu2_probe,
.remove = __devexit_p(sh_mtu2_remove), .remove = sh_mtu2_remove,
.driver = { .driver = {
.name = "sh_mtu2", .name = "sh_mtu2",
} }
......
...@@ -484,7 +484,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) ...@@ -484,7 +484,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
return ret; return ret;
} }
static int __devinit sh_tmu_probe(struct platform_device *pdev) static int sh_tmu_probe(struct platform_device *pdev)
{ {
struct sh_tmu_priv *p = platform_get_drvdata(pdev); struct sh_tmu_priv *p = platform_get_drvdata(pdev);
struct sh_timer_config *cfg = pdev->dev.platform_data; struct sh_timer_config *cfg = pdev->dev.platform_data;
...@@ -525,14 +525,14 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev) ...@@ -525,14 +525,14 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit sh_tmu_remove(struct platform_device *pdev) static int sh_tmu_remove(struct platform_device *pdev)
{ {
return -EBUSY; /* cannot unregister clockevent and clocksource */ return -EBUSY; /* cannot unregister clockevent and clocksource */
} }
static struct platform_driver sh_tmu_device_driver = { static struct platform_driver sh_tmu_device_driver = {
.probe = sh_tmu_probe, .probe = sh_tmu_probe,
.remove = __devexit_p(sh_tmu_remove), .remove = sh_tmu_remove,
.driver = { .driver = {
.name = "sh_tmu", .name = "sh_tmu",
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment