Skip to contentSkip to conversation

sonypi section usage

PATCH In review Randy.Dunlap 2 participants 2 messages Mar 8, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sonypi section usage

Hi Stelian,

Please apply to 2.6.current.

Thanks,
--
~Randy

// Linux 2.6.4-rc2
// sonypi_type[12]_srs() are called by sonypi_pm_callback() // so they shouldn't be marked as __devinit;

diffstat:=

 drivers/char/sonypi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/char/sonypi.c renamed from drivers/char/sonypi.c~sonypi_init +2 -2
diff -Naurp ./drivers/char/sonypi.c~sonypi_init ./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(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))
 		printk(KERN_WARNING "ec_write failed\n");
 	if (sonypi_ec_write(SONYPI_SLOB,  sonypi_device.ioport1 & 0x00FF))
#1 lore raw
Quoted 3 lines · Randy.Dunlap

Hi Stelian,

Please apply to 2.6.current.

Thanks Randy, applied to my tree and will send it to Linus with the next round of updates.

Stelian.

Signature · 1 line
Stelian Pop <[email protected]>