X86: drivers: 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, __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: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Daniel Drake <dsd@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -309,7 +309,7 @@ static int xo1_sci_resume(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit setup_sci_interrupt(struct platform_device *pdev)
|
||||
static int setup_sci_interrupt(struct platform_device *pdev)
|
||||
{
|
||||
u32 lo, hi;
|
||||
u32 sts;
|
||||
@@ -351,7 +351,7 @@ static int __devinit setup_sci_interrupt(struct platform_device *pdev)
|
||||
return r;
|
||||
}
|
||||
|
||||
static int __devinit setup_ec_sci(void)
|
||||
static int setup_ec_sci(void)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -395,7 +395,7 @@ static void free_ec_sci(void)
|
||||
gpio_free(OLPC_GPIO_ECSCI);
|
||||
}
|
||||
|
||||
static int __devinit setup_lid_events(void)
|
||||
static int setup_lid_events(void)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -432,7 +432,7 @@ static void free_lid_events(void)
|
||||
gpio_free(OLPC_GPIO_LID);
|
||||
}
|
||||
|
||||
static int __devinit setup_power_button(struct platform_device *pdev)
|
||||
static int setup_power_button(struct platform_device *pdev)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -463,7 +463,7 @@ static void free_power_button(void)
|
||||
input_free_device(power_button_idev);
|
||||
}
|
||||
|
||||
static int __devinit setup_ebook_switch(struct platform_device *pdev)
|
||||
static int setup_ebook_switch(struct platform_device *pdev)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -494,7 +494,7 @@ static void free_ebook_switch(void)
|
||||
input_free_device(ebook_switch_idev);
|
||||
}
|
||||
|
||||
static int __devinit setup_lid_switch(struct platform_device *pdev)
|
||||
static int setup_lid_switch(struct platform_device *pdev)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -538,7 +538,7 @@ static void free_lid_switch(void)
|
||||
input_free_device(lid_switch_idev);
|
||||
}
|
||||
|
||||
static int __devinit xo1_sci_probe(struct platform_device *pdev)
|
||||
static int xo1_sci_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res;
|
||||
int r;
|
||||
@@ -613,7 +613,7 @@ err_ebook:
|
||||
return r;
|
||||
}
|
||||
|
||||
static int __devexit xo1_sci_remove(struct platform_device *pdev)
|
||||
static int xo1_sci_remove(struct platform_device *pdev)
|
||||
{
|
||||
mfd_cell_disable(pdev);
|
||||
free_irq(sci_irq, pdev);
|
||||
@@ -632,7 +632,7 @@ static struct platform_driver xo1_sci_driver = {
|
||||
.name = "olpc-xo1-sci-acpi",
|
||||
},
|
||||
.probe = xo1_sci_probe,
|
||||
.remove = __devexit_p(xo1_sci_remove),
|
||||
.remove = xo1_sci_remove,
|
||||
.suspend = xo1_sci_suspend,
|
||||
.resume = xo1_sci_resume,
|
||||
};
|
||||
|
Reference in New Issue
Block a user