Skip to contentSkip to conversation

fix compilation in collie.c

PATCH NAK Pavel Machek 3 participants 4 messages Jul 21, 2005 – Jul 25, 2005

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

PATCH 1/1 fix compilation in collie.c

This fixes wrong number of arguments in call to write_scoop_reg, fixes map_name and John's email. Please apply,

arch/arm/mach-sa1100/collie.c +5 -5
@@ -11,7 +11,7 @@
  * published by the Free Software Foundation.
  *
  * ChangeLog:
- *  03-06-2004 John Lenz <[email protected]>
+ *  03-06-2004 John Lenz <[email protected]>
  *  06-04-2002 Chris Larson <[email protected]>
  *  04-16-2001 Lineo Japan,Inc. ...
  */
@@ -111,16 +180,16 @@ static struct mtd_partition collie_parti
 
 static void collie_set_vpp(int vpp)
 {
-	write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN);
+	write_scoop_reg(NULL, SCOOP_GPCR, read_scoop_reg(NULL, SCOOP_GPCR) | COLLIE_SCP_VPEN);
 	if (vpp) {
-		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN);
+		write_scoop_reg(NULL, SCOOP_GPWR, read_scoop_reg(NULL, SCOOP_GPWR) | COLLIE_SCP_VPEN);
 	} else {
-		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
+		write_scoop_reg(NULL, SCOOP_GPWR, read_scoop_reg(NULL, SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
 	}
 }
 
 static struct flash_platform_data collie_flash_data = {
-	.map_name	= "cfi_probe",
+	.map_name	= "sharp",
 	.set_vpp	= collie_set_vpp,
 	.parts		= collie_partitions,
 	.nr_parts	= ARRAY_SIZE(collie_partitions),
Signature · 1 line
teflon -- maybe it is a trademark, but it should not be.
#1 lore raw
Quoted 4 lines · Pavel Machek

This fixes wrong number of arguments in call to write_scoop_reg, fixes map_name and John's email. Please apply,

Nacked.

I'd like John (or someone) to look at this. I'm particularly worred about:

1. passing NULL into (read|write)_scoop_reg() - which use dev_get_drvdata() on this. Given the choice between creating code which will definitely oops but not error or warn vs not compiling, I'll take not compiling any day.

2. whether this is supposed to be using the sharp chip driver rather than the cfi stuff.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
#2 lore raw
Quoted 7 lines · Russell King

I'd like John (or someone) to look at this. I'm particularly worred about:

1. passing NULL into (read|write)_scoop_reg() - which use dev_get_drvdata() on this. Given the choice between creating code which will definitely oops but not error or warn vs not compiling, I'll take not compiling any day.

They should read write_scoop_reg(&colliescoop_device.dev, ...); in this case.

There is a similar problem with drivers/input/keyboard/corgikbd.c for which the patch has been in the input maintainer's queue for months :-(.

Quoted 2 lines

2. whether this is supposed to be using the sharp chip driver rather than the cfi stuff.

I think the aim was to use the cfi code but there were problems with it not working so the sharp chip driver was being used in the meantime. John will hopefully be able to comment more about this.

Richard

#3 lore raw
In reply to Russell King

This fixes wrong number of arguments in call to write_scoop_reg and John's email. Please apply,
Pavel

arch/arm/mach-sa1100/collie.c +6 -4
@@ -11,7 +11,7 @@
  * published by the Free Software Foundation.
  *
  * ChangeLog:
- *  03-06-2004 John Lenz <[email protected]>
+ *  03-06-2004 John Lenz <[email protected]>
  *  06-04-2002 Chris Larson <[email protected]>
  *  04-16-2001 Lineo Japan,Inc. ...
  */
@@ -111,16 +180,18 @@ static struct mtd_partition collie_parti
 
 static void collie_set_vpp(int vpp)
 {
-	write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN);
+	struct device *dev = &colliescoop_device.dev;
+
+	write_scoop_reg(dev, SCOOP_GPCR, read_scoop_reg(dev, SCOOP_GPCR) | COLLIE_SCP_VPEN);
 	if (vpp) {
-		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN);
+		write_scoop_reg(dev, SCOOP_GPWR, read_scoop_reg(dev, SCOOP_GPWR) | COLLIE_SCP_VPEN);
 	} else {
-		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
+		write_scoop_reg(dev, SCOOP_GPWR, read_scoop_reg(dev, SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
 	}
 }
 
 static struct flash_platform_data collie_flash_data = {
 	.map_name	= "cfi_probe",
 	.set_vpp	= collie_set_vpp,
 	.parts		= collie_partitions,
 	.nr_parts	= ARRAY_SIZE(collie_partitions),
Signature · 1 line
teflon -- maybe it is a trademark, but it should not be.