Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

3 files changed, 106 insertions, 88 deletions

diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 7b424e0b0449..32c44040c1e8 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -27,6 +27,7 @@
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
 #include <linux/pci.h>
+#include <linux/seq_file.h>
 #include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
@@ -105,37 +106,40 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info)
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *proc_pccard = NULL;
 
-static int proc_read_drivers_callback(struct device_driver *driver, void *d)
+static int proc_read_drivers_callback(struct device_driver *driver, void *_m)
 {
-        char **p = d;
+        struct seq_file *m = _m;
         struct pcmcia_driver *p_drv = container_of(driver,
                                                    struct pcmcia_driver, drv);
 
-        *p += sprintf(*p, "%-24.24s 1 %d\n", p_drv->drv.name,
+        seq_printf(m, "%-24.24s 1 %d\n", p_drv->drv.name,
 #ifdef CONFIG_MODULE_UNLOAD
                       (p_drv->owner) ? module_refcount(p_drv->owner) : 1
 #else
                       1
 #endif
         );
-        d = (void *) p;
-
         return 0;
 }
 
-static int proc_read_drivers(char *buf, char **start, off_t pos,
-                             int count, int *eof, void *data)
+static int pccard_drivers_proc_show(struct seq_file *m, void *v)
 {
-        char *p = buf;
-        int rc;
-
-        rc = bus_for_each_drv(&pcmcia_bus_type, NULL,
-                              (void *) &p, proc_read_drivers_callback);
-        if (rc < 0)
-                return rc;
+        return bus_for_each_drv(&pcmcia_bus_type, NULL,
+                                m, proc_read_drivers_callback);
+}
 
-        return (p - buf);
+static int pccard_drivers_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pccard_drivers_proc_show, NULL);
 }
+
+static const struct file_operations pccard_drivers_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pccard_drivers_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif
 
 
@@ -1011,7 +1015,7 @@ void __init pcmcia_setup_ioctl(void) {
 #ifdef CONFIG_PROC_FS
         proc_pccard = proc_mkdir("bus/pccard", NULL);
         if (proc_pccard)
-                create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL);
+                proc_create("drivers", 0, proc_pccard, &pccard_drivers_proc_fops);
 #endif
 }
 
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c
index 57ca085473d5..7eedb42f800c 100644
--- a/drivers/pcmcia/sa1100_jornada720.c
+++ b/drivers/pcmcia/sa1100_jornada720.c
@@ -16,89 +16,103 @@
 
 #include "sa1111_generic.h"
 
-#define SOCKET0_POWER   GPIO_GPIO0
-#define SOCKET0_3V      GPIO_GPIO2
-#define SOCKET1_POWER   (GPIO_GPIO1 | GPIO_GPIO3)
-#warning *** Does SOCKET1_3V actually do anything?
+/* Does SOCKET1_3V actually do anything? */
+#define SOCKET0_POWER   GPIO_GPIO0
+#define SOCKET0_3V      GPIO_GPIO2
+#define SOCKET1_POWER   (GPIO_GPIO1 | GPIO_GPIO3)
 #define SOCKET1_3V      GPIO_GPIO3
 
 static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-  /*
-   * What is all this crap for?
-   */
-  GRER |= 0x00000002;
-  /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
-  sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);
-  sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-  sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-
-  return sa1111_pcmcia_hw_init(skt);
+        unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
+
+        /*
+        * What is all this crap for?
+        */
+        GRER |= 0x00000002;
+        /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
+        sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);
+        sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);
+        sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);
+
+        return sa1111_pcmcia_hw_init(skt);
 }
 
 static int
 jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 {
-  unsigned int pa_dwr_mask, pa_dwr_set;
-  int ret;
-
-printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
-        skt->nr, state->Vcc, state->Vpp);
-
-  switch (skt->nr) {
-  case 0:
-    pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
-
-    switch (state->Vcc) {
-    default:
-    case 0:     pa_dwr_set = 0;                                 break;
-    case 33:    pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;        break;
-    case 50:    pa_dwr_set = SOCKET0_POWER;                     break;
-    }
-    break;
-
-  case 1:
-    pa_dwr_mask = SOCKET1_POWER;
-
-    switch (state->Vcc) {
-    default:
-    case 0:     pa_dwr_set = 0;                                 break;
-    case 33:    pa_dwr_set = SOCKET1_POWER;                     break;
-    case 50:    pa_dwr_set = SOCKET1_POWER;                     break;
-    }
-    break;
-
-  default:
-    return -1;
-  }
-
-  if (state->Vpp != state->Vcc && state->Vpp != 0) {
-    printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
-           __func__, state->Vpp);
-    return -1;
-  }
-
-  ret = sa1111_pcmcia_configure_socket(skt, state);
-  if (ret == 0) {
-    unsigned long flags;
-
-    local_irq_save(flags);
-    sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
-    local_irq_restore(flags);
-  }
-
-  return ret;
+        unsigned int pa_dwr_mask, pa_dwr_set;
+        int ret;
+
+        printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
+                skt->nr, state->Vcc, state->Vpp);
+
+        switch (skt->nr) {
+        case 0:
+                pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
+
+                switch (state->Vcc) {
+                default:
+                case  0:
+                        pa_dwr_set = 0;
+                        break;
+                case 33:
+                        pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
+                        break;
+                case 50:
+                        pa_dwr_set = SOCKET0_POWER;
+                        break;
+                }
+                break;
+
+        case 1:
+                pa_dwr_mask = SOCKET1_POWER;
+
+                switch (state->Vcc) {
+                default:
+                case 0:
+                        pa_dwr_set = 0;
+                        break;
+                case 33:
+                        pa_dwr_set = SOCKET1_POWER;
+                        break;
+                case 50:
+                        pa_dwr_set = SOCKET1_POWER;
+                        break;
+                }
+                break;
+
+        default:
+                return -1;
+        }
+
+        if (state->Vpp != state->Vcc && state->Vpp != 0) {
+                printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
+                        __func__, state->Vpp);
+                return -EPERM;
+        }
+
+        ret = sa1111_pcmcia_configure_socket(skt, state);
+        if (ret == 0) {
+                unsigned long flags;
+
+                local_irq_save(flags);
+                sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
+                local_irq_restore(flags);
+        }
+
+        return ret;
 }
 
 static struct pcmcia_low_level jornada720_pcmcia_ops = {
-  .owner                = THIS_MODULE,
-  .hw_init              = jornada720_pcmcia_hw_init,
-  .hw_shutdown          = sa1111_pcmcia_hw_shutdown,
-  .socket_state         = sa1111_pcmcia_socket_state,
-  .configure_socket     = jornada720_pcmcia_configure_socket,
-
-  .socket_init          = sa1111_pcmcia_socket_init,
-  .socket_suspend       = sa1111_pcmcia_socket_suspend,
+        .owner                  = THIS_MODULE,
+        .hw_init                = jornada720_pcmcia_hw_init,
+        .hw_shutdown            = sa1111_pcmcia_hw_shutdown,
+        .socket_state           = sa1111_pcmcia_socket_state,
+        .configure_socket       = jornada720_pcmcia_configure_socket,
+
+        .socket_init            = sa1111_pcmcia_socket_init,
+        .socket_suspend         = sa1111_pcmcia_socket_suspend,
 };
 
 int __devinit pcmcia_jornada720_init(struct device *dev)
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 737fe5d87c40..b459e87a30ac 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -717,7 +717,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
 /*
  * Close it down - release our resources and go home..
  */
-static void yenta_close(struct pci_dev *dev)
+static void __devexit yenta_close(struct pci_dev *dev)
 {
         struct yenta_socket *sock = pci_get_drvdata(dev);