<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
From: Dmitry Torokhov &lt;dtor_core@ameritech.net&gt;

===================================================================

ChangeSet@1.1793, 2004-06-17 18:18:43-05:00, dtor_core@ameritech.net
  Input: rename serio-&gt;driver to serio-&gt;port_data in preparation
         to sysfs integration
  
  Signed-off-by: Dmitry Torokhov &lt;dtor@mail.ru&gt;

===================================================================

Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
---

 25-akpm/drivers/input/mouse/synaptics.c |    4 +--
 25-akpm/drivers/input/serio/ambakmi.c   |   25 +++++++++++-----------
 25-akpm/drivers/input/serio/gscps2.c    |    8 +++----
 25-akpm/drivers/input/serio/i8042.c     |   14 ++++++------
 25-akpm/drivers/input/serio/maceps2.c   |   36 ++++++++++++++++----------------
 25-akpm/drivers/input/serio/pcips2.c    |    8 +++----
 25-akpm/drivers/input/serio/sa1111ps2.c |    8 +++----
 25-akpm/drivers/input/serio/serport.c   |    6 ++---
 25-akpm/include/linux/serio.h           |    2 -
 9 files changed, 56 insertions(+), 55 deletions(-)

diff -puN drivers/input/mouse/synaptics.c~input-serio-renames-1 drivers/input/mouse/synaptics.c
--- 25/drivers/input/mouse/synaptics.c~input-serio-renames-1	2004-06-21 00:03:02.414215568 -0700
+++ 25-akpm/drivers/input/mouse/synaptics.c	2004-06-21 00:03:02.429213288 -0700
@@ -214,7 +214,7 @@ static int synaptics_set_mode(struct psm
  ****************************************************************************/
 static int synaptics_pt_write(struct serio *port, unsigned char c)
 {
-	struct psmouse *parent = port-&gt;driver;
+	struct psmouse *parent = port-&gt;port_data;
 	char rate_param = SYN_PS_CLIENT_CMD; /* indicates that we want pass-through port */
 
 	if (psmouse_sliced_command(parent, c))
@@ -273,7 +273,7 @@ static void synaptics_pt_create(struct p
 	port-&gt;serio.name = "Synaptics pass-through";
 	port-&gt;serio.phys = "synaptics-pt/serio0";
 	port-&gt;serio.write = synaptics_pt_write;
-	port-&gt;serio.driver = psmouse;
+	port-&gt;serio.port_data = psmouse;
 
 	port-&gt;activate = synaptics_pt_activate;
 }
diff -puN drivers/input/serio/ambakmi.c~input-serio-renames-1 drivers/input/serio/ambakmi.c
--- 25/drivers/input/serio/ambakmi.c~input-serio-renames-1	2004-06-21 00:03:02.415215416 -0700
+++ 25-akpm/drivers/input/serio/ambakmi.c	2004-06-21 00:03:02.430213136 -0700
@@ -54,7 +54,7 @@ static irqreturn_t amba_kmi_int(int irq,
 
 static int amba_kmi_write(struct serio *io, unsigned char val)
 {
-	struct amba_kmi_port *kmi = io-&gt;driver;
+	struct amba_kmi_port *kmi = io-&gt;port_data;
 	unsigned int timeleft = 10000; /* timeout in 100ms */
 
 	while ((readb(KMISTAT) &amp; KMISTAT_TXEMPTY) == 0 &amp;&amp; timeleft--)
@@ -68,7 +68,7 @@ static int amba_kmi_write(struct serio *
 
 static int amba_kmi_open(struct serio *io)
 {
-	struct amba_kmi_port *kmi = io-&gt;driver;
+	struct amba_kmi_port *kmi = io-&gt;port_data;
 	unsigned int divisor;
 	int ret;
 
@@ -105,7 +105,7 @@ static int amba_kmi_open(struct serio *i
 
 static void amba_kmi_close(struct serio *io)
 {
-	struct amba_kmi_port *kmi = io-&gt;driver;
+	struct amba_kmi_port *kmi = io-&gt;port_data;
 
 	writeb(0, KMICR);
 
@@ -131,27 +131,28 @@ static int amba_kmi_probe(struct amba_de
 
 	memset(kmi, 0, sizeof(struct amba_kmi_port));
 
-	kmi-&gt;io.type	= SERIO_8042;
-	kmi-&gt;io.write	= amba_kmi_write;
-	kmi-&gt;io.open	= amba_kmi_open;
-	kmi-&gt;io.close	= amba_kmi_close;
-	kmi-&gt;io.name	= dev-&gt;dev.bus_id;
-	kmi-&gt;io.phys	= dev-&gt;dev.bus_id;
-	kmi-&gt;io.driver	= kmi;
+	kmi-&gt;io.type = SERIO_8042;
+	kmi-&gt;io.write = amba_kmi_write;
+	kmi-&gt;io.open = amba_kmi_open;
+	kmi-&gt;io.close = amba_kmi_close;
+	kmi-&gt;io.name = dev-&gt;dev.bus_id;
+	kmi-&gt;io.phys = dev-&gt;dev.bus_id;
+	kmi-&gt;io.port_data = kmi;
+
+	kmi-&gt;base = ioremap(dev-&gt;res.start, KMI_SIZE);
 
-	kmi-&gt;base	= ioremap(dev-&gt;res.start, KMI_SIZE);
 	if (!kmi-&gt;base) {
 		ret = -ENOMEM;
 		goto out;
 	}
 
+	kmi-&gt;irq = dev-&gt;irq[0];
 	kmi-&gt;clk = clk_get(&amp;dev-&gt;dev, "KMIREFCLK");
 	if (IS_ERR(kmi-&gt;clk)) {
 		ret = PTR_ERR(kmi-&gt;clk);
 		goto unmap;
 	}
 
-	kmi-&gt;irq = dev-&gt;irq[0];
 	amba_set_drvdata(dev, kmi);
 
 	serio_register_port(&amp;kmi-&gt;io);
diff -puN drivers/input/serio/gscps2.c~input-serio-renames-1 drivers/input/serio/gscps2.c
--- 25/drivers/input/serio/gscps2.c~input-serio-renames-1	2004-06-21 00:03:02.417215112 -0700
+++ 25-akpm/drivers/input/serio/gscps2.c	2004-06-21 00:03:02.430213136 -0700
@@ -288,7 +288,7 @@ static irqreturn_t gscps2_interrupt(int 
 
 static int gscps2_write(struct serio *port, unsigned char data)
 {
-	struct gscps2port *ps2port = port-&gt;driver;
+	struct gscps2port *ps2port = port-&gt;port_data;
 
 	if (!gscps2_writeb_output(ps2port, data)) {
 		printk(KERN_DEBUG PFX "sending byte %#x failed.\n", data);
@@ -304,7 +304,7 @@ static int gscps2_write(struct serio *po
 
 static int gscps2_open(struct serio *port)
 {
-	struct gscps2port *ps2port = port-&gt;driver;
+	struct gscps2port *ps2port = port-&gt;port_data;
 
 	gscps2_reset(ps2port);
 
@@ -319,7 +319,7 @@ static int gscps2_open(struct serio *por
 
 static void gscps2_close(struct serio *port)
 {
-	struct gscps2port *ps2port = port-&gt;driver;
+	struct gscps2port *ps2port = port-&gt;port_data;
 	gscps2_enable(ps2port, DISABLE);
 }
 
@@ -372,7 +372,7 @@ static int __init gscps2_probe(struct pa
 		(ps2port-&gt;id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse" );
 
 	memcpy(&amp;ps2port-&gt;port, &amp;gscps2_serio_port, sizeof(gscps2_serio_port));
-	ps2port-&gt;port.driver = ps2port;
+	ps2port-&gt;port.port_data = ps2port;
 	ps2port-&gt;port.name = ps2port-&gt;name;
 	ps2port-&gt;port.phys = dev-&gt;dev.bus_id;
 
diff -puN drivers/input/serio/i8042.c~input-serio-renames-1 drivers/input/serio/i8042.c
--- 25/drivers/input/serio/i8042.c~input-serio-renames-1	2004-06-21 00:03:02.419214808 -0700
+++ 25-akpm/drivers/input/serio/i8042.c	2004-06-21 00:03:02.432212832 -0700
@@ -223,7 +223,7 @@ static int i8042_kbd_write(struct serio 
 
 static int i8042_aux_write(struct serio *port, unsigned char c)
 {
-	struct i8042_values *values = port-&gt;driver;
+	struct i8042_values *values = port-&gt;port_data;
 	int retval;
 
 /*
@@ -251,7 +251,7 @@ static int i8042_aux_write(struct serio 
 
 static int i8042_activate_port(struct serio *port)
 {
-	struct i8042_values *values = port-&gt;driver;
+	struct i8042_values *values = port-&gt;port_data;
 
 	i8042_flush();
 
@@ -279,7 +279,7 @@ static int i8042_activate_port(struct se
 
 static int i8042_open(struct serio *port)
 {
-	struct i8042_values *values = port-&gt;driver;
+	struct i8042_values *values = port-&gt;port_data;
 
 	if (values-&gt;mux != -1)
 		if (i8042_mux_open++)
@@ -318,7 +318,7 @@ irq_fail:
 
 static void i8042_close(struct serio *port)
 {
-	struct i8042_values *values = port-&gt;driver;
+	struct i8042_values *values = port-&gt;port_data;
 
 	if (values-&gt;mux != -1)
 		if (--i8042_mux_open)
@@ -353,7 +353,7 @@ static struct serio i8042_kbd_port =
 	.write =	i8042_kbd_write,
 	.open =		i8042_open,
 	.close =	i8042_close,
-	.driver =	&amp;i8042_kbd_values,
+	.port_data =	&amp;i8042_kbd_values,
 	.name =		"i8042 Kbd Port",
 	.phys =		I8042_KBD_PHYS_DESC,
 };
@@ -371,7 +371,7 @@ static struct serio i8042_aux_port =
 	.write =	i8042_aux_write,
 	.open =		i8042_open,
 	.close =	i8042_close,
-	.driver =	&amp;i8042_aux_values,
+	.port_data =	&amp;i8042_aux_values,
 	.name =		"i8042 Aux Port",
 	.phys =		I8042_AUX_PHYS_DESC,
 };
@@ -941,7 +941,7 @@ static void __init i8042_init_mux_values
 	sprintf(i8042_mux_short[index], "AUX%d", index);
 	port-&gt;name = i8042_mux_names[index];
 	port-&gt;phys = i8042_mux_phys[index];
-	port-&gt;driver = values;
+	port-&gt;port_data = values;
 	values-&gt;name = i8042_mux_short[index];
 	values-&gt;mux = index;
 }
diff -puN drivers/input/serio/maceps2.c~input-serio-renames-1 drivers/input/serio/maceps2.c
--- 25/drivers/input/serio/maceps2.c~input-serio-renames-1	2004-06-21 00:03:02.420214656 -0700
+++ 25-akpm/drivers/input/serio/maceps2.c	2004-06-21 00:03:02.432212832 -0700
@@ -54,7 +54,7 @@ struct maceps2_data {
 
 static int maceps2_write(struct serio *dev, unsigned char val)
 {
-	struct mace_ps2port *port = ((struct maceps2_data *)dev-&gt;driver)-&gt;port;
+	struct mace_ps2port *port = ((struct maceps2_data *)dev-&gt;port_data)-&gt;port;
 	unsigned int timeout = MACE_PS2_TIMEOUT;
 
 	do {
@@ -72,7 +72,7 @@ static irqreturn_t maceps2_interrupt(int
 				     struct pt_regs *regs)
 {
 	struct serio *dev = dev_id;
-	struct mace_ps2port *port = ((struct maceps2_data *)dev-&gt;driver)-&gt;port;
+	struct mace_ps2port *port = ((struct maceps2_data *)dev-&gt;port_data)-&gt;port;
 	unsigned int byte;
 
 	if (mace_read(port-&gt;status) &amp; PS2_STATUS_RX_FULL) {
@@ -85,7 +85,7 @@ static irqreturn_t maceps2_interrupt(int
 
 static int maceps2_open(struct serio *dev)
 {
-	struct maceps2_data *data = (struct maceps2_data *)dev-&gt;driver;
+	struct maceps2_data *data = (struct maceps2_data *)dev-&gt;port_data;
 
 	if (request_irq(data-&gt;irq, maceps2_interrupt, 0, "PS/2 port", dev)) {
 		printk(KERN_ERR "Could not allocate PS/2 IRQ\n");
@@ -106,7 +106,7 @@ static int maceps2_open(struct serio *de
 
 static void maceps2_close(struct serio *dev)
 {
-	struct maceps2_data *data = (struct maceps2_data *)dev-&gt;driver;
+	struct maceps2_data *data = (struct maceps2_data *)dev-&gt;port_data;
 
 	mace_write(PS2_CONTROL_TX_CLOCK_DISABLE | PS2_CONTROL_RESET,
 		   data-&gt;port-&gt;control);
@@ -118,24 +118,24 @@ static struct maceps2_data port0_data, p
 
 static struct serio maceps2_port0 =
 {
-	.type	= SERIO_8042,
-	.open	= maceps2_open,
-	.close	= maceps2_close,
-	.write	= maceps2_write,
-	.name	= "MACE PS/2 port0",
-	.phys	= "mace/serio0",
-	.driver = &amp;port0_data,
+	.type		= SERIO_8042,
+	.open		= maceps2_open,
+	.close		= maceps2_close,
+	.write		= maceps2_write,
+	.name		= "MACE PS/2 port0",
+	.phys		= "mace/serio0",
+	.port_data	= &amp;port0_data,
 };
 
 static struct serio maceps2_port1 =
 {
-	.type	= SERIO_8042,
-	.open	= maceps2_open,
-	.close	= maceps2_close,
-	.write	= maceps2_write,
-	.name	= "MACE PS/2 port1",
-	.phys	= "mace/serio1",
-	.driver = &amp;port1_data,
+	.type		= SERIO_8042,
+	.open		= maceps2_open,
+	.close		= maceps2_close,
+	.write		= maceps2_write,
+	.name		= "MACE PS/2 port1",
+	.phys		= "mace/serio1",
+	.port_data	= &amp;port1_data,
 };
 
 static int __init maceps2_init(void)
diff -puN drivers/input/serio/pcips2.c~input-serio-renames-1 drivers/input/serio/pcips2.c
--- 25/drivers/input/serio/pcips2.c~input-serio-renames-1	2004-06-21 00:03:02.421214504 -0700
+++ 25-akpm/drivers/input/serio/pcips2.c	2004-06-21 00:03:02.433212680 -0700
@@ -45,7 +45,7 @@ struct pcips2_data {
 
 static int pcips2_write(struct serio *io, unsigned char val)
 {
-	struct pcips2_data *ps2if = io-&gt;driver;
+	struct pcips2_data *ps2if = io-&gt;port_data;
 	unsigned int stat;
 
 	do {
@@ -101,7 +101,7 @@ static void pcips2_flush_input(struct pc
 
 static int pcips2_open(struct serio *io)
 {
-	struct pcips2_data *ps2if = io-&gt;driver;
+	struct pcips2_data *ps2if = io-&gt;port_data;
 	int ret, val = 0;
 
 	outb(PS2_CTRL_ENABLE, ps2if-&gt;base);
@@ -119,7 +119,7 @@ static int pcips2_open(struct serio *io)
 
 static void pcips2_close(struct serio *io)
 {
-	struct pcips2_data *ps2if = io-&gt;driver;
+	struct pcips2_data *ps2if = io-&gt;port_data;
 
 	outb(0, ps2if-&gt;base);
 
@@ -155,7 +155,7 @@ static int __devinit pcips2_probe(struct
 	ps2if-&gt;io.close		= pcips2_close;
 	ps2if-&gt;io.name		= pci_name(dev);
 	ps2if-&gt;io.phys		= dev-&gt;dev.bus_id;
-	ps2if-&gt;io.driver	= ps2if;
+	ps2if-&gt;io.port_data	= ps2if;
 	ps2if-&gt;dev		= dev;
 	ps2if-&gt;base		= pci_resource_start(dev, 0);
 
diff -puN drivers/input/serio/sa1111ps2.c~input-serio-renames-1 drivers/input/serio/sa1111ps2.c
--- 25/drivers/input/serio/sa1111ps2.c~input-serio-renames-1	2004-06-21 00:03:02.423214200 -0700
+++ 25-akpm/drivers/input/serio/sa1111ps2.c	2004-06-21 00:03:02.433212680 -0700
@@ -95,7 +95,7 @@ static irqreturn_t ps2_txint(int irq, vo
  */
 static int ps2_write(struct serio *io, unsigned char val)
 {
-	struct ps2if *ps2if = io-&gt;driver;
+	struct ps2if *ps2if = io-&gt;port_data;
 	unsigned long flags;
 	unsigned int head;
 
@@ -122,7 +122,7 @@ static int ps2_write(struct serio *io, u
 
 static int ps2_open(struct serio *io)
 {
-	struct ps2if *ps2if = io-&gt;driver;
+	struct ps2if *ps2if = io-&gt;port_data;
 	int ret;
 
 	sa1111_enable_device(ps2if-&gt;dev);
@@ -154,7 +154,7 @@ static int ps2_open(struct serio *io)
 
 static void ps2_close(struct serio *io)
 {
-	struct ps2if *ps2if = io-&gt;driver;
+	struct ps2if *ps2if = io-&gt;port_data;
 
 	sa1111_writel(0, ps2if-&gt;base + SA1111_PS2CR);
 
@@ -247,7 +247,7 @@ static int ps2_probe(struct sa1111_dev *
 	ps2if-&gt;io.close		= ps2_close;
 	ps2if-&gt;io.name		= dev-&gt;dev.bus_id;
 	ps2if-&gt;io.phys		= dev-&gt;dev.bus_id;
-	ps2if-&gt;io.driver	= ps2if;
+	ps2if-&gt;io.port_data	= ps2if;
 	ps2if-&gt;dev		= dev;
 	sa1111_set_drvdata(dev, ps2if);
 
diff -puN drivers/input/serio/serport.c~input-serio-renames-1 drivers/input/serio/serport.c
--- 25/drivers/input/serio/serport.c~input-serio-renames-1	2004-06-21 00:03:02.424214048 -0700
+++ 25-akpm/drivers/input/serio/serport.c	2004-06-21 00:03:02.434212528 -0700
@@ -44,13 +44,13 @@ char serport_name[] = "Serial port";
 
 static int serport_serio_write(struct serio *serio, unsigned char data)
 {
-	struct serport *serport = serio-&gt;driver;
+	struct serport *serport = serio-&gt;port_data;
 	return -(serport-&gt;tty-&gt;driver-&gt;write(serport-&gt;tty, 0, &amp;data, 1) != 1);
 }
 
 static void serport_serio_close(struct serio *serio)
 {
-	struct serport *serport = serio-&gt;driver;
+	struct serport *serport = serio-&gt;port_data;
 
 	serport-&gt;serio.type = 0;
 	wake_up_interruptible(&amp;serport-&gt;wait);
@@ -83,7 +83,7 @@ static int serport_ldisc_open(struct tty
 	serport-&gt;serio.type = SERIO_RS232;
 	serport-&gt;serio.write = serport_serio_write;
 	serport-&gt;serio.close = serport_serio_close;
-	serport-&gt;serio.driver = serport;
+	serport-&gt;serio.port_data = serport;
 
 	init_waitqueue_head(&amp;serport-&gt;wait);
 
diff -puN include/linux/serio.h~input-serio-renames-1 include/linux/serio.h
--- 25/include/linux/serio.h~input-serio-renames-1	2004-06-21 00:03:02.425213896 -0700
+++ 25-akpm/include/linux/serio.h	2004-06-21 00:03:02.434212528 -0700
@@ -21,7 +21,7 @@
 
 struct serio {
 	void *private;
-	void *driver;
+	void *port_data;
 	char *name;
 	char *phys;
 
_
</pre></body></html>