10 files changed, 57 insertions, 58 deletions

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 93f8a8fa8890..a5d826237b26 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1560,7 +1560,7 @@ static int ccio_probe(struct parisc_device *dev)
         *ioc_p = ioc;
 
         ioc->hw_path = dev->hw_path;
-        ioc->ioc_regs = ioremap(dev->hpa.start, 4096);
+        ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
         ccio_ioc_init(ioc);
         ccio_init_resources(ioc);
         hppa_dma_ops = &ccio_ops;
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 3d1a7f98c676..6e8ed0c81a6c 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -5,6 +5,7 @@
 **      (c) Copyright 1999 SuSE GmbH
 **      (c) Copyright 1999,2000 Hewlett-Packard Company
 **      (c) Copyright 2000 Grant Grundler
+**      (c) Copyright 2006 Helge Deller
 **
 **      This program is free software; you can redistribute it and/or modify
 **      it under the terms of the GNU General Public License as published by
@@ -785,7 +786,7 @@ dino_bridge_init(struct dino_device *dino_dev, const char *name)
                 if((io_addr & (1 << i)) == 0)
                         continue;
 
-                start = (unsigned long)(signed int)(0xf0000000 | (i << 23));
+                start = F_EXTEND(0xf0000000UL) | (i << 23);
                 end = start + 8 * 1024 * 1024 - 1;
 
                 DBG("DINO RANGE %d is at 0x%lx-0x%lx\n", count,
@@ -996,7 +997,7 @@ static int __init dino_probe(struct parisc_device *dev)
         }
 
         dino_dev->hba.dev = dev;
-        dino_dev->hba.base_addr = ioremap(hpa, 4096);
+        dino_dev->hba.base_addr = ioremap_nocache(hpa, 4096);
         dino_dev->hba.lmmio_space_offset = 0;   /* CPU addrs == bus addrs */
         spin_lock_init(&dino_dev->dinosaur_pen);
         dino_dev->hba.iommu = ccio_get_iommu(dev);
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 3d94d86c1c9f..9d3bd15bf53b 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -366,7 +366,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)
                         eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
                 }
         }
-        eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
+        eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
         result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,
                         &eisa_dev.hba.lmmio_space);
         init_eisa_pic();
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 8d7a36392eb8..7a458d5bc751 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -879,7 +879,7 @@ void *iosapic_register(unsigned long hpa)
                 return NULL;
         }
 
-        isi->addr = ioremap(hpa, 4096);
+        isi->addr = ioremap_nocache(hpa, 4096);
         isi->isi_hpa = hpa;
         isi->isi_version = iosapic_rd_version(isi);
         isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index e8a2a4a852f5..3fe4a77fa16a 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -1213,7 +1213,7 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
                         ** Postable I/O port space is per PCI host adapter.
                         ** base of 64MB PIOP region
                         */
-                        lba_dev->iop_base = ioremap(p->start, 64 * 1024 * 1024);
+                        lba_dev->iop_base = ioremap_nocache(p->start, 64 * 1024 * 1024);
 
                         sprintf(lba_dev->hba.io_name, "PCI%02lx Ports",
                                         lba_dev->hba.bus_num.start);
@@ -1525,7 +1525,7 @@ lba_driver_probe(struct parisc_device *dev)
         u32 func_class;
         void *tmp_obj;
         char *version;
-        void __iomem *addr = ioremap(dev->hpa.start, 4096);
+        void __iomem *addr = ioremap_nocache(dev->hpa.start, 4096);
 
         /* Read HW Rev First */
         func_class = READ_REG32(addr + LBA_FCLASS);
@@ -1619,7 +1619,7 @@ lba_driver_probe(struct parisc_device *dev)
         } else {
                 if (!astro_iop_base) {
                         /* Sprockets PDC uses NPIOP region */
-                        astro_iop_base = ioremap(LBA_PORT_BASE, 64 * 1024);
+                        astro_iop_base = ioremap_nocache(LBA_PORT_BASE, 64 * 1024);
                         pci_port = &lba_astro_port_ops;
                 }
 
@@ -1700,7 +1700,7 @@ void __init lba_init(void)
 */
 void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
 {
-        void __iomem * base_addr = ioremap(lba->hpa.start, 4096);
+        void __iomem * base_addr = ioremap_nocache(lba->hpa.start, 4096);
 
         imask <<= 2;    /* adjust for hints - 2 more bits */
 
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 3627a2d7f79f..298f2ddb2c17 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -499,11 +499,16 @@ static int led_halt(struct notifier_block *, unsigned long, void *);
 static struct notifier_block led_notifier = {
         .notifier_call = led_halt,
 };
+static int notifier_disabled = 0;
 
 static int led_halt(struct notifier_block *nb, unsigned long event, void *buf) 
 {
         char *txt;
-        
+
+        if (notifier_disabled)
+                return NOTIFY_OK;
+
+        notifier_disabled = 1;
         switch (event) {
         case SYS_RESTART:       txt = "SYSTEM RESTART";
                                 break;
@@ -527,7 +532,6 @@ static int led_halt(struct notifier_block *nb, unsigned long event, void *buf)
                 if (led_func_ptr)
                         led_func_ptr(0xff); /* turn all LEDs ON */
         
-        unregister_reboot_notifier(&led_notifier);
         return NOTIFY_OK;
 }
 
@@ -758,6 +762,12 @@ not_found:
         return 1;
 }
 
+static void __exit led_exit(void)
+{
+        unregister_reboot_notifier(&led_notifier);
+        return;
+}
+
 #ifdef CONFIG_PROC_FS
 module_init(led_create_procfs)
 #endif
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index a28e17898fbd..4e53be9c03ab 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -4,9 +4,8 @@
  *    Copyright (C) 2005-2006 Thibaut VARENE <varenet@parisc-linux.org>
  *
  *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
+ *    it under the terms of the GNU General Public License, version 2, as
+ *    published by the Free Software Foundation.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 54b2b7f20b96..0bcab83b4080 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -251,7 +251,8 @@ static int __init power_init(void)
         }
 
         /* Register a call for panic conditions. */
-        notifier_chain_register(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_register(&panic_notifier_list,
+                        &parisc_panic_block);
 
         tasklet_enable(&power_tasklet);
 
@@ -264,7 +265,8 @@ static void __exit power_exit(void)
                 return;
 
         tasklet_disable(&power_tasklet);
-        notifier_chain_unregister(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_unregister(&panic_notifier_list,
+                        &parisc_panic_block);
         power_tasklet.func = NULL;
         pdc_soft_power_button(0);
 }
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 5d47c5965c51..42b32ff2fca6 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1642,9 +1642,9 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 **
 **************************************************************************/
 
-static void __iomem *ioc_remap(struct sba_device *sba_dev, int offset)
+static void __iomem *ioc_remap(struct sba_device *sba_dev, unsigned int offset)
 {
-        return ioremap(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);
+        return ioremap_nocache(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);
 }
 
 static void sba_hw_init(struct sba_device *sba_dev)
@@ -1724,9 +1724,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
                 sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL;
                 sba_dev->chip_resv.end   = PCI_F_EXTEND | (0xff000000UL - 1) ;
                 err = request_resource(&iomem_resource, &(sba_dev->chip_resv));
-                if (err < 0) {
-                        BUG();
-                }
+                BUG_ON(err < 0);
 
         } else if (IS_PLUTO(sba_dev->iodc)) {
                 int err;
@@ -2042,7 +2040,7 @@ sba_driver_callback(struct parisc_device *dev)
         u32 func_class;
         int i;
         char *version;
-        void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE);
+        void __iomem *sba_addr = ioremap_nocache(dev->hpa.start, SBA_FUNC_SIZE);
         struct proc_dir_entry *info_entry, *bitmap_entry, *root;
 
         sba_dump_ranges(sba_addr);
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
         int i;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
         int base, size;
         int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */
 
-        if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT))
-                BUG();
+        BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT));
 
         r->start = r->end = 0;
 
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index ba971fecd0d8..719b863bc20e 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -12,6 +12,7 @@
  *      (C) Copyright 2001 John Marvin <jsm fc hp com>
  *      (C) Copyright 2003 Grant Grundler <grundler parisc-linux org>
  *      (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org>
+ *      (C) Copyright 2006 Helge Deller <deller@gmx.de>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License as
@@ -157,8 +158,8 @@ superio_init(struct pci_dev *pcidev)
         if (sio->suckyio_irq_enabled)                                       
                 return;
 
-        if (!pdev) BUG();
-        if (!sio->usb_pdev) BUG();
+        BUG_ON(!pdev);
+        BUG_ON(!sio->usb_pdev);
 
         /* use the IRQ iosapic found for USB INT D... */
         pdev->irq = sio->usb_pdev->irq;
@@ -388,43 +389,34 @@ int superio_fixup_irq(struct pci_dev *pcidev)
         return local_irq;
 }
 
-static struct uart_port serial[] = {
-        {
-                .iotype         = UPIO_PORT,
-                .line           = 0,
-                .type           = PORT_16550A,
-                .uartclk        = 115200*16,
-                .fifosize       = 16,
-        },
-        {
-                .iotype         = UPIO_PORT,
-                .line           = 1,
-                .type           = PORT_16550A,
-                .uartclk        = 115200*16,
-                .fifosize       = 16,
-        }
-};
-
 static void __devinit superio_serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250
         int retval;
-        
-        serial[0].iobase = sio_dev.sp1_base;
-        serial[0].irq = SP1_IRQ;
-        spin_lock_init(&serial[0].lock);
-
-        retval = early_serial_setup(&serial[0]);
+        struct uart_port serial_port;
+
+        memset(&serial_port, 0, sizeof(serial_port));
+        serial_port.iotype      = UPIO_PORT;
+        serial_port.type        = PORT_16550A;
+        serial_port.uartclk     = 115200*16;
+        serial_port.fifosize    = 16;
+        spin_lock_init(&serial_port.lock);
+
+        /* serial port #1 */
+        serial_port.iobase      = sio_dev.sp1_base;
+        serial_port.irq         = SP1_IRQ;
+        serial_port.line        = 0;
+        retval = early_serial_setup(&serial_port);
         if (retval < 0) {
                 printk(KERN_WARNING PFX "Register Serial #0 failed.\n");
                 return;
         }
 
-        serial[1].iobase = sio_dev.sp2_base;
-        serial[1].irq = SP2_IRQ;
-        spin_lock_init(&serial[1].lock);
-        retval = early_serial_setup(&serial[1]);
-
+        /* serial port #2 */
+        serial_port.iobase      = sio_dev.sp2_base;
+        serial_port.irq         = SP2_IRQ;
+        serial_port.line        = 1;
+        retval = early_serial_setup(&serial_port);
         if (retval < 0)
                 printk(KERN_WARNING PFX "Register Serial #1 failed.\n");
 #endif /* CONFIG_SERIAL_8250 */
@@ -474,8 +466,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 dev->subsystem_vendor, dev->subsystem_device,
                 dev->class);
 
-        if (!sio->suckyio_irq_enabled)
-                BUG(); /* Enabled by PCI_FIXUP_FINAL */
+        BUG_ON(!sio->suckyio_irq_enabled);      /* Enabled by PCI_FIXUP_FINAL */
 
         if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) {        /* Function 1 */
                 superio_parport_init();