[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.

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 7627d4281a59bda2e60cea21303820fcb667f975..a3780cdef21dfb4e61cabaac36dbafee65dac1d2 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -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 */
-static void __devinit sonypi_type1_srs(void) {
+static void sonypi_type1_srs(void) {
        u32 v;
 
        pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
@@ -151,7 +151,7 @@ static void __devinit sonypi_type1_srs(void) {
        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))
                printk(KERN_WARNING "ec_write failed\n");
        if (sonypi_ec_write(SONYPI_SLOB,  sonypi_device.ioport1 & 0x00FF))

diff --git a/drivers/char/sonypi.h b/drivers/char/sonypi.h
index 78b56129e4f0e4bb8098a23d1b3f305501c5f64e..38e4fec9d27c4049e5d6637cfe03e6ffbcf5406f 100644 (file)
--- a/drivers/char/sonypi.h
+++ b/drivers/char/sonypi.h
@@ -37,7 +37,7 @@
 #ifdef __KERNEL__
 
 #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_TYPE2      2