Commit c1d1c7cd authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sonypi devinit section usage

From: Stelian Pop <stelian@popies.net>

This patch removes the usage of __devinit in the srs methods of the sonypi
driver, because those functions are also called from sonypi_pm_callback().

Patch originally from Randy Dunlap.
parent 647abae9
...@@ -129,7 +129,7 @@ static int ec_read16(u8 addr, u16 *value) { ...@@ -129,7 +129,7 @@ static int ec_read16(u8 addr, u16 *value) {
} }
/* Initializes the device - this comes from the AML code in the ACPI bios */ /* Initializes the device - this comes from the AML code in the ACPI bios */
static void __devinit sonypi_type1_srs(void) { static void sonypi_type1_srs(void) {
u32 v; u32 v;
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
...@@ -151,7 +151,7 @@ static void __devinit sonypi_type1_srs(void) { ...@@ -151,7 +151,7 @@ static void __devinit sonypi_type1_srs(void) {
pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v); pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v);
} }
static void __devinit sonypi_type2_srs(void) { static void sonypi_type2_srs(void) {
if (sonypi_ec_write(SONYPI_SHIB, (sonypi_device.ioport1 & 0xFF00) >> 8)) if (sonypi_ec_write(SONYPI_SHIB, (sonypi_device.ioport1 & 0xFF00) >> 8))
printk(KERN_WARNING "ec_write failed\n"); printk(KERN_WARNING "ec_write failed\n");
if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF)) if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF))
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#define SONYPI_DRIVER_MAJORVERSION 1 #define SONYPI_DRIVER_MAJORVERSION 1
#define SONYPI_DRIVER_MINORVERSION 21 #define SONYPI_DRIVER_MINORVERSION 22
#define SONYPI_DEVICE_MODEL_TYPE1 1 #define SONYPI_DEVICE_MODEL_TYPE1 1
#define SONYPI_DEVICE_MODEL_TYPE2 2 #define SONYPI_DEVICE_MODEL_TYPE2 2
......
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