sparc64: Move request_irq() from ldc_bind() to ldc_alloc()

[karo-tx-linux.git] / arch / sparc / kernel / viohs.c

diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c
index f8e7dd53e1c7d7f62912f22100445e323b77afe5..9c5fbd0b8a04e83a8b2147087e3735199ee490be 100644 (file)
--- a/arch/sparc/kernel/viohs.c
+++ b/arch/sparc/kernel/viohs.c
@@ -714,7 +714,7 @@ int vio_ldc_alloc(struct vio_driver_state *vio,
        cfg.tx_irq = vio->vdev->tx_irq;
        cfg.rx_irq = vio->vdev->rx_irq;
 
-       lp = ldc_alloc(vio->vdev->channel_id, &cfg, event_arg);
+       lp = ldc_alloc(vio->vdev->channel_id, &cfg, event_arg, vio->name);
        if (IS_ERR(lp))
                return PTR_ERR(lp);
 
@@ -746,7 +746,7 @@ void vio_port_up(struct vio_driver_state *vio)
 
        err = 0;
        if (state == LDC_STATE_INIT) {
-               err = ldc_bind(vio->lp, vio->name);
+               err = ldc_bind(vio->lp);
                if (err)
                        printk(KERN_WARNING "%s: Port %lu bind failed, "
                               "err=%d\n",