12 files changed, 71 insertions, 88 deletions

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 7c88c060a9e6..46685a540772 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,7 +1,6 @@
 config AGP
-        tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+        tristate "/dev/agpgart (AGP Support)"
         depends on ALPHA || IA64 || PPC || X86
-        default y if GART_IOMMU
         ---help---
           AGP (Accelerated Graphics Port) is a bus system mainly used to
           connect graphics cards to the rest of the system.
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 8c4c6ef748ec..907fb66ec4a9 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -497,7 +497,7 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
                         info = buffer.pointer;
                         info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0';
                         match = (strcmp(info->hardware_id.value, "HWP0001") == 0);
-                        ACPI_MEM_FREE(info);
+                        kfree(info);
                         if (match) {
                                 status = hp_acpi_csr_space(handle, &sba_hpa, &length);
                                 if (ACPI_SUCCESS(status))
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index ef140ebde117..07473cd84121 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -925,11 +925,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
         status = acpi_resource_to_address64(res, &addr);
 
         if (ACPI_SUCCESS(status)) {
-                unsigned long size;
-
-                size = addr.maximum - addr.minimum + 1;
                 hdp->hd_phys_address = addr.minimum;
-                hdp->hd_address = ioremap(addr.minimum, size);
+                hdp->hd_address = ioremap(addr.minimum, addr.address_length);
 
                 if (hpet_is_known(hdp)) {
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 2b6a56b2bf35..a5c6a9d7ff08 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -553,7 +553,6 @@ static int hvc_chars_in_buffer(struct tty_struct *tty)
 
 #define HVC_POLL_READ   0x00000001
 #define HVC_POLL_WRITE  0x00000002
-#define HVC_POLL_QUICK  0x00000004
 
 static int hvc_poll(struct hvc_struct *hp)
 {
@@ -568,6 +567,7 @@ static int hvc_poll(struct hvc_struct *hp)
         /* Push pending writes */
         if (hp->n_outbuf > 0)
                 hvc_push(hp);
+
         /* Reschedule us if still some write pending */
         if (hp->n_outbuf > 0)
                 poll_mask |= HVC_POLL_WRITE;
@@ -680,7 +680,7 @@ int khvcd(void *unused)
                         poll_mask |= HVC_POLL_READ;
                 if (hvc_kicked)
                         continue;
-                if (poll_mask & HVC_POLL_QUICK) {
+                if (poll_mask & HVC_POLL_WRITE) {
                         yield();
                         continue;
                 }
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
index 83364ea63cba..57106e02fd2e 100644
--- a/drivers/char/hvc_rtas.c
+++ b/drivers/char/hvc_rtas.c
@@ -41,37 +41,28 @@
 #define hvc_rtas_cookie 0x67781e15
 struct hvc_struct *hvc_rtas_dev;
 
-#define RTASCONS_PUT_ATTEMPTS  16
-
 static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;
 static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;
-static int rtascons_put_delay = 100;
-module_param_named(put_delay, rtascons_put_delay, int, 0644);
 
-static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count)
+static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf,
+                int count)
 {
-        int done;
+        int i;
 
-        /* if there is more than one character to be displayed, wait a bit */
-        for (done = 0; done < count; done++) {
-                int result;
-                result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]);
-                if (result)
+        for (i = 0; i < count; i++) {
+                if (rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[i]))
                         break;
         }
-        /* the calling routine expects to receive the number of bytes sent */
-        return done;
+
+        return i;
 }
 
 static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
 {
-        int i;
+        int i, c;
 
         for (i = 0; i < count; i++) {
-                int c, err;
-
-                err = rtas_call(rtascons_get_char_token, 0, 2, &c);
-                if (err)
+                if (rtas_call(rtascons_get_char_token, 0, 2, &c))
                         break;
 
                 buf[i] = c;
@@ -106,7 +97,9 @@ static int hvc_rtas_init(void)
         hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
+
         hvc_rtas_dev = hp;
+
         return 0;
 }
 module_init(hvc_rtas_init);
@@ -114,8 +107,8 @@ module_init(hvc_rtas_init);
 /* This will tear down the tty portion of the driver */
 static void __exit hvc_rtas_exit(void)
 {
-        /* Really the fun isn't over until the worker thread breaks down and the
-         * tty cleans up */
+        /* Really the fun isn't over until the worker thread breaks down and
+         * the tty cleans up */
         if (hvc_rtas_dev)
                 hvc_remove(hvc_rtas_dev);
 }
@@ -127,12 +120,14 @@ static int hvc_rtas_console_init(void)
         rtascons_put_char_token = rtas_token("put-term-char");
         if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
                 return -EIO;
+
         rtascons_get_char_token = rtas_token("get-term-char");
         if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
                 return -EIO;
 
-        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops );
+        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops);
         add_preferred_console("hvc", 0, NULL);
+
         return 0;
 }
 console_initcall(hvc_rtas_console_init);
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index a9522189fc9e..a0370ed752ce 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1179,7 +1179,7 @@ static int __init hvsi_init(void)
         if (tty_register_driver(hvsi_driver))
                 panic("Couldn't register hvsi console driver\n");
 
-        printk(KERN_INFO "HVSI: registered %i devices\n", hvsi_count);
+        printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count);
 
         return 0;
 }
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 2d11ddd99e55..8f8867170973 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -212,24 +212,16 @@ static int set_param_str(const char *val, struct kernel_param *kp)
 {
         action_fn  fn = (action_fn) kp->arg;
         int        rv = 0;
-        const char *end;
-        char       valcp[16];
-        int        len;
-
-        /* Truncate leading and trailing spaces. */
-        while (isspace(*val))
-                val++;
-        end = val + strlen(val) - 1;
-        while ((end >= val) && isspace(*end))
-                end--;
-        len = end - val + 1;
-        if (len > sizeof(valcp) - 1)
-                return -EINVAL;
-        memcpy(valcp, val, len);
-        valcp[len] = '\0';
+        char       *dup, *s;
+
+        dup = kstrdup(val, GFP_KERNEL);
+        if (!dup)
+                return -ENOMEM;
+
+        s = strstrip(dup);
 
         down_read(&register_sem);
-        rv = fn(valcp, NULL);
+        rv = fn(s, NULL);
         if (rv)
                 goto out_unlock;
 
@@ -239,6 +231,7 @@ static int set_param_str(const char *val, struct kernel_param *kp)
 
  out_unlock:
         up_read(&register_sem);
+        kfree(dup);
         return rv;
 }
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 07213454c458..0c141c295fb6 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -844,7 +844,7 @@ static int bh_action(MGSLPC_INFO *info)
         return rc;
 }
 
-void bh_handler(void* Context)
+static void bh_handler(void* Context)
 {
         MGSLPC_INFO *info = (MGSLPC_INFO*)Context;
         int action;
@@ -888,7 +888,7 @@ void bh_handler(void* Context)
                         __FILE__,__LINE__,info->device_name);
 }
 
-void bh_transmit(MGSLPC_INFO *info)
+static void bh_transmit(MGSLPC_INFO *info)
 {
         struct tty_struct *tty = info->tty;
         if (debug_level >= DEBUG_LEVEL_BH)
@@ -900,7 +900,7 @@ void bh_transmit(MGSLPC_INFO *info)
         }
 }
 
-void bh_status(MGSLPC_INFO *info)
+static void bh_status(MGSLPC_INFO *info)
 {
         info->ri_chkcount = 0;
         info->dsr_chkcount = 0;
@@ -2305,7 +2305,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
         return ioctl_common(info, cmd, arg);
 }
 
-int ioctl_common(MGSLPC_INFO *info, unsigned int cmd, unsigned long arg)
+static int ioctl_common(MGSLPC_INFO *info, unsigned int cmd, unsigned long arg)
 {
         int error;
         struct mgsl_icount cnow;        /* kernel counter temps */
@@ -2877,7 +2877,7 @@ done:
         return ((count < begin+len-off) ? count : begin+len-off);
 }
 
-int rx_alloc_buffers(MGSLPC_INFO *info)
+static int rx_alloc_buffers(MGSLPC_INFO *info)
 {
         /* each buffer has header and data */
         info->rx_buf_size = sizeof(RXBUF) + info->max_frame_size;
@@ -2900,13 +2900,13 @@ int rx_alloc_buffers(MGSLPC_INFO *info)
         return 0;
 }
 
-void rx_free_buffers(MGSLPC_INFO *info)
+static void rx_free_buffers(MGSLPC_INFO *info)
 {
         kfree(info->rx_buf);
         info->rx_buf = NULL;
 }
 
-int claim_resources(MGSLPC_INFO *info)
+static int claim_resources(MGSLPC_INFO *info)
 {
         if (rx_alloc_buffers(info) < 0 ) {
                 printk( "Cant allocate rx buffer %s\n", info->device_name);
@@ -2916,7 +2916,7 @@ int claim_resources(MGSLPC_INFO *info)
         return 0;
 }
 
-void release_resources(MGSLPC_INFO *info)
+static void release_resources(MGSLPC_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("release_resources(%s)\n", info->device_name);
@@ -2928,7 +2928,7 @@ void release_resources(MGSLPC_INFO *info)
  *      
  * Arguments:           info    pointer to device instance data
  */
-void mgslpc_add_device(MGSLPC_INFO *info)
+static void mgslpc_add_device(MGSLPC_INFO *info)
 {
         info->next_device = NULL;
         info->line = mgslpc_device_count;
@@ -2964,7 +2964,7 @@ void mgslpc_add_device(MGSLPC_INFO *info)
 #endif
 }
 
-void mgslpc_remove_device(MGSLPC_INFO *remove_info)
+static void mgslpc_remove_device(MGSLPC_INFO *remove_info)
 {
         MGSLPC_INFO *info = mgslpc_device_list;
         MGSLPC_INFO *last = NULL;
@@ -3257,7 +3257,7 @@ static void loopback_enable(MGSLPC_INFO *info)
         write_reg(info, CHA + MODE, val);
 }
 
-void hdlc_mode(MGSLPC_INFO *info)
+static void hdlc_mode(MGSLPC_INFO *info)
 {
         unsigned char val;
         unsigned char clkmode, clksubmode;
@@ -3497,7 +3497,7 @@ void hdlc_mode(MGSLPC_INFO *info)
         rx_stop(info);
 }
 
-void rx_stop(MGSLPC_INFO *info)
+static void rx_stop(MGSLPC_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):rx_stop(%s)\n",
@@ -3510,7 +3510,7 @@ void rx_stop(MGSLPC_INFO *info)
         info->rx_overflow = 0;
 }
 
-void rx_start(MGSLPC_INFO *info)
+static void rx_start(MGSLPC_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):rx_start(%s)\n",
@@ -3526,7 +3526,7 @@ void rx_start(MGSLPC_INFO *info)
         info->rx_enabled = 1;
 }
 
-void tx_start(MGSLPC_INFO *info)
+static void tx_start(MGSLPC_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):tx_start(%s)\n",
@@ -3564,7 +3564,7 @@ void tx_start(MGSLPC_INFO *info)
                 info->tx_enabled = 1;
 }
 
-void tx_stop(MGSLPC_INFO *info)
+static void tx_stop(MGSLPC_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):tx_stop(%s)\n",
@@ -3578,7 +3578,7 @@ void tx_stop(MGSLPC_INFO *info)
 
 /* Reset the adapter to a known state and prepare it for further use.
  */
-void reset_device(MGSLPC_INFO *info)
+static void reset_device(MGSLPC_INFO *info)
 {
         /* power up both channels (set BIT7) */ 
         write_reg(info, CHA + CCR0, 0x80);
@@ -3628,7 +3628,7 @@ void reset_device(MGSLPC_INFO *info)
         write_reg(info, IPC, 0x05);
 }
 
-void async_mode(MGSLPC_INFO *info)
+static void async_mode(MGSLPC_INFO *info)
 {
         unsigned char val;
 
@@ -3799,7 +3799,7 @@ void async_mode(MGSLPC_INFO *info)
 
 /* Set the HDLC idle mode for the transmitter.
  */
-void tx_set_idle(MGSLPC_INFO *info)
+static void tx_set_idle(MGSLPC_INFO *info)
 {
         /* Note: ESCC2 only supports flags and one idle modes */ 
         if (info->idle_mode == HDLC_TXIDLE_FLAGS)
@@ -3810,7 +3810,7 @@ void tx_set_idle(MGSLPC_INFO *info)
 
 /* get state of the V24 status (input) signals.
  */
-void get_signals(MGSLPC_INFO *info)
+static void get_signals(MGSLPC_INFO *info)
 {
         unsigned char status = 0;
         
@@ -3832,7 +3832,7 @@ void get_signals(MGSLPC_INFO *info)
 /* Set the state of DTR and RTS based on contents of
  * serial_signals member of device extension.
  */
-void set_signals(MGSLPC_INFO *info)
+static void set_signals(MGSLPC_INFO *info)
 {
         unsigned char val;
 
@@ -3856,7 +3856,7 @@ void set_signals(MGSLPC_INFO *info)
                 set_reg_bits(info, CHA + PVR, PVR_DTR);
 }
 
-void rx_reset_buffers(MGSLPC_INFO *info)
+static void rx_reset_buffers(MGSLPC_INFO *info)
 {
         RXBUF *buf;
         int i;
@@ -3875,7 +3875,7 @@ void rx_reset_buffers(MGSLPC_INFO *info)
  *
  * Returns 1 if frame returned, otherwise 0
  */
-int rx_get_frame(MGSLPC_INFO *info)
+static int rx_get_frame(MGSLPC_INFO *info)
 {
         unsigned short status;
         RXBUF *buf;
@@ -3961,7 +3961,7 @@ int rx_get_frame(MGSLPC_INFO *info)
         return 1;
 }
 
-BOOLEAN register_test(MGSLPC_INFO *info)
+static BOOLEAN register_test(MGSLPC_INFO *info)
 {
         static unsigned char patterns[] = 
             { 0x00, 0xff, 0xaa, 0x55, 0x69, 0x96, 0x0f };
@@ -3987,7 +3987,7 @@ BOOLEAN register_test(MGSLPC_INFO *info)
         return rc;
 }
 
-BOOLEAN irq_test(MGSLPC_INFO *info)
+static BOOLEAN irq_test(MGSLPC_INFO *info)
 {
         unsigned long end_time;
         unsigned long flags;
@@ -4022,7 +4022,7 @@ BOOLEAN irq_test(MGSLPC_INFO *info)
         return info->irq_occurred ? TRUE : FALSE;
 }
 
-int adapter_test(MGSLPC_INFO *info)
+static int adapter_test(MGSLPC_INFO *info)
 {
         if (!register_test(info)) {
                 info->init_error = DiagStatus_AddressFailure;
@@ -4044,7 +4044,7 @@ int adapter_test(MGSLPC_INFO *info)
         return 0;
 }
 
-void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)
+static void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)
 {
         int i;
         int linecount;
@@ -4079,7 +4079,7 @@ void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)
 /* HDLC frame time out
  * update stats and do tx completion processing
  */
-void tx_timeout(unsigned long context)
+static void tx_timeout(unsigned long context)
 {
         MGSLPC_INFO *info = (MGSLPC_INFO*)context;
         unsigned long flags;
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 7cac6d05d723..f6686fcce809 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -960,10 +960,6 @@ found:
          * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
         if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
-                /*
-                 * Standard way for sparc to print irq's is to use
-                 * __irq_itoa(). I think for EBus it's ok to use %d.
-                 */
                 printk(KERN_ERR "rtc: cannot register IRQ %d\n", rtc_irq);
                 return -EIO;
         }
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index a90f5d97df35..43dfd8689dce 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -512,7 +512,7 @@ static struct sonypi_device {
 
 #ifdef CONFIG_ACPI
 static struct acpi_device *sonypi_acpi_device;
-static int acpi_enabled;
+static int acpi_driver_registered;
 #endif
 
 static int sonypi_ec_write(u8 addr, u8 value)
@@ -869,7 +869,7 @@ found:
                 sonypi_report_input_event(event);
 
 #ifdef CONFIG_ACPI
-        if (acpi_enabled)
+        if (sonypi_acpi_device)
                 acpi_bus_generate_event(sonypi_acpi_device, 1, event);
 #endif
 
@@ -1551,8 +1551,8 @@ static int __init sonypi_init(void)
                 goto err_free_device;
 
 #ifdef CONFIG_ACPI
-        if (acpi_bus_register_driver(&sonypi_acpi_driver) > 0)
-                acpi_enabled = 1;
+        if (acpi_bus_register_driver(&sonypi_acpi_driver) >= 0)
+                acpi_driver_registered = 1;
 #endif
 
         return 0;
@@ -1567,7 +1567,7 @@ static int __init sonypi_init(void)
 static void __exit sonypi_exit(void)
 {
 #ifdef CONFIG_ACPI
-        if (acpi_enabled)
+        if (acpi_driver_registered)
                 acpi_bus_unregister_driver(&sonypi_acpi_driver);
 #endif
         platform_device_unregister(sonypi_platform_device);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index a88b94a82b14..8b2a59969868 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2961,12 +2961,14 @@ static struct class *tty_class;
  *      This field is optional, if there is no known struct device for this
  *      tty device it can be set to NULL safely.
  *
+ * Returns a pointer to the class device (or ERR_PTR(-EFOO) on error).
+ *
  * This call is required to be made to register an individual tty device if
  * the tty driver's flags have the TTY_DRIVER_NO_DEVFS bit set.  If that
  * bit is not set, this function should not be called.
  */
-void tty_register_device(struct tty_driver *driver, unsigned index,
-                         struct device *device)
+struct class_device *tty_register_device(struct tty_driver *driver,
+                                         unsigned index, struct device *device)
 {
         char name[64];
         dev_t dev = MKDEV(driver->major, driver->minor_start) + index;
@@ -2974,7 +2976,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
         if (index >= driver->num) {
                 printk(KERN_ERR "Attempt to register invalid tty line number "
                        " (%d).\n", index);
-                return;
+                return ERR_PTR(-EINVAL);
         }
 
         devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
@@ -2984,7 +2986,8 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
                 pty_line_name(driver, index, name);
         else
                 tty_line_name(driver, index, name);
-        class_device_create(tty_class, NULL, dev, device, "%s", name);
+
+        return class_device_create(tty_class, NULL, dev, device, "%s", name);
 }
 
 /**
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 60aabdb4a046..11c7e9de5958 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -989,7 +989,7 @@ static int viotape_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viotape_device_table[] __devinitdata = {
-        { "viotape", "" },
+        { "byte", "IBM,iSeries-viotape" },
         { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viotape_device_table);