Skip to contentSkip to conversation

sonypi: Fix initialization warning

PATCH In review Richard Knutsson 3 participants 5 messages Aug 5, 2007 – Aug 8, 2007

Subsystems (3)
ACPI Char and misc drivers Sony vaio control device driver
lore
Share & tools
lore

Richard Knutsson

author
#0 lore raw

PATCH 1/1 sonypi: Fix initialization warning

Signed-off-by Richard Knutsson <[email protected]>

---
Got this from the compiler (gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-13)):
drivers/char/sonypi.c:1153: warning: initialization from incompatible pointer type

drivers/char/sonypi.c +0 -0
index 73037a4..2dcd519 100644
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)

	return 0;
}

+static const struct acpi_device_id sonypi_acpi_driver_ids[] = {
+ {ACPI_PROCESSOR_HID, 0},
+ {"", 0},
+};
+
static struct acpi_driver sonypi_acpi_driver = {
.name = "sonypi",
.class = "hkey",
- .ids = "SNY6001",
+ .ids = sonypi_acpi_driver_ids,
.ops = {
.add = sonypi_acpi_add, .remove = sonypi_acpi_remove,

#1 lore raw
Quoted 11 lines · Richard Knutsson
Signed-off-by Richard Knutsson <[email protected]>

---
Got this from the compiler (gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-13)):
drivers/char/sonypi.c:1153: warning: initialization from incompatible pointer type

drivers/char/sonypi.c +0 -0
index 73037a4..2dcd519 100644

drivers/char/sonypi.c static int sonypi_acpi_remove(struct acpi_device *device, int type) · line 1151

Quoted 5 lines
drivers/char/sonypi.c +2 -0
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
+static const struct acpi_device_id sonypi_acpi_driver_ids[] = {
+        {ACPI_PROCESSOR_HID, 0},

This is wrong. You need to take the HID the driver should match for, in this case: {"SNY6001", 0 },

drivers/char/sonypi.c static int sonypi_acpi_remove(struct acpi_device *device, int type) · line 1161

Quoted 11 lines
drivers/char/sonypi.c +4 -1
+        {"", 0},
+};
+
 static struct acpi_driver sonypi_acpi_driver = {
 	.name           = "sonypi",
 	.class          = "hkey",
-	.ids            = "SNY6001",
+	.ids            = sonypi_acpi_driver_ids,
 	.ops            = {
 		           .add = sonypi_acpi_add,
 			   .remove = sonypi_acpi_remove,

A patch from Eugene Teo fixing this is already on the list of Len's patches.
See subject: [PATCH 04/12] sonypi: fix ids member of struct acpi_driver posted yesterday on linux-acpi.
Anyway, thanks for the heads up,

Thomas

author
#2 lore raw
Quoted 16 lines · Thomas Renninger
Quoted 14 lines · Richard Knutsson
Signed-off-by Richard Knutsson <[email protected]>

---
Got this from the compiler (gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-13)):
drivers/char/sonypi.c:1153: warning: initialization from incompatible pointer type

drivers/char/sonypi.c +0 -0
index 73037a4..2dcd519 100644
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
Quoted 6 lines

drivers/char/sonypi.c static int sonypi_acpi_remove(struct acpi_device *device, int type) · line 1152

Quoted 3 lines
drivers/char/sonypi.c +2 -0
+static const struct acpi_device_id sonypi_acpi_driver_ids[] = {
+        {ACPI_PROCESSOR_HID, 0},

This is wrong. You need to take the HID the driver should match for, in this case: {"SNY6001", 0 },

Oh bugger, a cut 'n' paste error...
Thanks for reviewing it.

reviewer
#3 lore raw
Quoted 17 lines · Richard Knutsson
Quoted 16 lines · Thomas Renninger
Quoted 14 lines · Richard Knutsson
Signed-off-by Richard Knutsson <[email protected]>

---
Got this from the compiler (gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-13)):
drivers/char/sonypi.c:1153: warning: initialization from incompatible pointer type

drivers/char/sonypi.c +0 -0
index 73037a4..2dcd519 100644
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
Quoted 6 lines
Quoted 6 lines

drivers/char/sonypi.c static int sonypi_acpi_remove(struct acpi_device *device, int type) · line 1152

Quoted 3 lines
drivers/char/sonypi.c +2 -0
+static const struct acpi_device_id sonypi_acpi_driver_ids[] = {
+        {ACPI_PROCESSOR_HID, 0},

This is wrong. You need to take the HID the driver should match for, in this case: {"SNY6001", 0 },

like this?

http://git.kernel.org/?p=linux/kernel/git/lenb/linux-acpi-2.6.git;a=commitdiff;h=f7b88ccb63188e775fe02e746c39ed177741cfc7;hp=11604ecf6fb9c2ab0152fbddb7ea2724438ef76e

http://marc.info/?l=linux-acpi&m=118618043526395&w=2

#4 lore raw
Quoted 25 lines · Len Brown
Quoted 17 lines · Richard Knutsson
Quoted 16 lines · Thomas Renninger
Quoted 14 lines · Richard Knutsson
Signed-off-by Richard Knutsson <[email protected]>

---
Got this from the compiler (gcc (GCC) 4.1.2 20070626 (Red Hat 4.1.2-13)):
drivers/char/sonypi.c:1153: warning: initialization from incompatible pointer type

drivers/char/sonypi.c +0 -0
index 73037a4..2dcd519 100644
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
Quoted 6 lines
Quoted 6 lines

drivers/char/sonypi.c static int sonypi_acpi_remove(struct acpi_device *device, int type) · line 1152

Quoted 3 lines
drivers/char/sonypi.c +2 -0
+static const struct acpi_device_id sonypi_acpi_driver_ids[] = {
+        {ACPI_PROCESSOR_HID, 0},

This is wrong. You need to take the HID the driver should match for, in this case: {"SNY6001", 0 },

Quoted 5 lines

like this?

http://git.kernel.org/?p=linux/kernel/git/lenb/linux-acpi-2.6.git;a=commitdiff;h=f7b88ccb63188e775fe02e746c39ed177741cfc7;hp=11604ecf6fb9c2ab0152fbddb7ea2724438ef76e

http://marc.info/?l=linux-acpi&m=118618043526395&w=2

Yes.

Thanks,

Thomas