[Blackfin] arch: Add proper SW System Reset delay sequence

[linux-2.6] / drivers / input / serio / gscps2.c

diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 081fdc3c7737a298d11884a9bae269c4fd0312b8..3e99df6be08465affbbb0550fd5be59688f71c39 100644 (file)
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -166,7 +166,7 @@ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data)
 
        /* make sure any received data is returned as fast as possible */
        /* this is important e.g. when we set the LEDs on the keyboard */
-       gscps2_interrupt(0, NULL, NULL);
+       gscps2_interrupt(0, NULL);
 
        return 1;
 }
@@ -306,7 +306,7 @@ static int gscps2_open(struct serio *port)
        /* enable it */
        gscps2_enable(ps2port, ENABLE);
 
-       gscps2_interrupt(0, NULL, NULL);
+       gscps2_interrupt(0, NULL);
 
        return 0;
 }
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
        if (dev->id.sversion == 0x96)
                hpa += GSC_DINO_OFFSET;
 
-       ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+       ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
+       serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!ps2port || !serio) {
                ret = -ENOMEM;
                goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
        dev_set_drvdata(&dev->dev, ps2port);
 
-       memset(ps2port, 0, sizeof(struct gscps2port));
-       memset(serio, 0, sizeof(struct serio));
        ps2port->port = serio;
        ps2port->padev = dev;
        ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);