regulator: Handle missing constraints in _regulator_disable()

[safe/jmp/linux-2.6] / drivers / parisc / wax.c

diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index e547d7d..da9d5ad 100644 (file)
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -68,20 +68,19 @@ wax_init_irq(struct gsc_asic *wax)
 //     gsc_writel(0xFFFFFFFF, base+0x2000); /* RS232-B on Wax */
 }
 
-int __init
-wax_init_chip(struct parisc_device *dev)
+static int __init wax_init_chip(struct parisc_device *dev)
 {
        struct gsc_asic *wax;
        struct parisc_device *parent;
        struct gsc_irq gsc_irq;
        int ret;
 
-       wax = kmalloc(sizeof(*wax), GFP_KERNEL);
+       wax = kzalloc(sizeof(*wax), GFP_KERNEL);
        if (!wax)
                return -ENOMEM;
 
        wax->name = "wax";
-       wax->hpa = dev->hpa;
+       wax->hpa = dev->hpa.start;
 
        wax->version = 0;   /* gsc_readb(wax->hpa+WAX_VER); */
        printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa);
@@ -93,7 +92,7 @@ wax_init_chip(struct parisc_device *dev)
        dev->irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ);
        if (dev->irq < 0) {
                printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                               __FUNCTION__);
+                               __func__);
                kfree(wax);
                return -EBUSY;
        }