[PATCH 41/47] link (some) serio ports to their parent devices

Vojtech Pavlik
2004-07-29T14:26:35Z

ChangeSet@1.1757.15.36, 2004-06-29 01:36:29-05:00, dtor_core@ameritech.net
Input: link serio ports to their parent devices in ambakmi,
gscps2, pcips2 and sa1111ps2 drivers

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

ambakmi.c | 1 +
gscps2.c | 1 +
pcips2.c | 1 +
sa1111ps2.c | 1 +
4 files changed, 4 insertions(+)

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

diff -Nru a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
--- a/drivers/input/serio/ambakmi.c Thu Jul 29 14:38:57 2004
+++ b/drivers/input/serio/ambakmi.c Thu Jul 29 14:38:57 2004
@@ -141,6 +141,7 @@
strlcpy(io->name, dev->dev.bus_id, sizeof(io->name));
strlcpy(io->phys, dev->dev.bus_id, sizeof(io->phys));
io->port_data = kmi;
+ io->dev.parent = &dev->dev;

kmi->io = io;
kmi->base = ioremap(dev->res.start, KMI_SIZE);
diff -Nru a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
--- a/drivers/input/serio/gscps2.c Thu Jul 29 14:38:57 2004
+++ b/drivers/input/serio/gscps2.c Thu Jul 29 14:38:57 2004
@@ -385,6 +385,7 @@
serio->open = gscps2_open;
serio->close = gscps2_close;
serio->port_data = ps2port;
+ serio->dev.parent = &dev->dev;

list_add_tail(&ps2port->node, &ps2port_list);

diff -Nru a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
--- a/drivers/input/serio/pcips2.c Thu Jul 29 14:38:57 2004
+++ b/drivers/input/serio/pcips2.c Thu Jul 29 14:38:57 2004
@@ -159,6 +159,7 @@
strlcpy(serio->name, pci_name(dev), sizeof(serio->name));
strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys));
serio->port_data = ps2if;
+ serio->dev.parent = &dev->dev;
ps2if->io = serio;
ps2if->dev = dev;
ps2if->base = pci_resource_start(dev, 0);
diff -Nru a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
--- a/drivers/input/serio/sa1111ps2.c Thu Jul 29 14:38:57 2004
+++ b/drivers/input/serio/sa1111ps2.c Thu Jul 29 14:38:57 2004
@@ -252,6 +252,7 @@
strlcpy(serio->name, dev->dev.bus_id, sizeof(serio->name));
strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys));
serio->port_data = ps2if;
+ serio->dev.parent = &dev->dev;
ps2if->io = serio;
ps2if->dev = dev;
sa1111_set_drvdata(dev, ps2if);