2 files changed, 30 insertions, 47 deletions

diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 8fdfa4f537a6..7dd370fa3439 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -67,14 +67,6 @@ MODULE_LICENSE("Dual MPL/GPL");
 
 INT_MODULE_PARM(epp_mode, 1);
 
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
-"parport_cs.c 1.29 2002/10/11 06:57:41 (David Hinds)";
-#else
-#define DEBUG(n, args...)
-#endif
 
 /*====================================================================*/
 
@@ -103,7 +95,7 @@ static int parport_probe(struct pcmcia_device *link)
 {
     parport_info_t *info;
 
-    DEBUG(0, "parport_attach()\n");
+    dev_dbg(&link->dev, "parport_attach()\n");
 
     /* Create new parport device */
     info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -114,7 +106,6 @@ static int parport_probe(struct pcmcia_device *link)
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -132,7 +123,7 @@ static int parport_probe(struct pcmcia_device *link)
 
 static void parport_detach(struct pcmcia_device *link)
 {
-    DEBUG(0, "parport_detach(0x%p)\n", link);
+    dev_dbg(&link->dev, "parport_detach\n");
 
     parport_cs_release(link);
 
@@ -147,9 +138,6 @@ static void parport_detach(struct pcmcia_device *link)
 
 ======================================================================*/
 
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-
 static int parport_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
                                 cistpl_cftable_entry_t *dflt,
@@ -178,18 +166,20 @@ static int parport_config(struct pcmcia_device *link)
 {
     parport_info_t *info = link->priv;
     struct parport *p;
-    int last_ret, last_fn;
+    int ret;
 
-    DEBUG(0, "parport_config(0x%p)\n", link);
+    dev_dbg(&link->dev, "parport_config\n");
 
-    last_ret = pcmcia_loop_config(link, parport_config_check, NULL);
-    if (last_ret) {
-            cs_error(link, RequestIO, last_ret);
+    ret = pcmcia_loop_config(link, parport_config_check, NULL);
+    if (ret)
             goto failed;
-    }
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+    ret = pcmcia_request_irq(link, &link->irq);
+    if (ret)
+            goto failed;
+    ret = pcmcia_request_configuration(link, &link->conf);
+    if (ret)
+            goto failed;
 
     p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
                               link->irq.AssignedIRQ, PARPORT_DMA_NONE,
@@ -213,8 +203,6 @@ static int parport_config(struct pcmcia_device *link)
 
     return 0;
 
-cs_failed:
-    cs_error(link, last_fn, last_ret);
 failed:
     parport_cs_release(link);
     return -ENODEV;
@@ -232,7 +220,7 @@ static void parport_cs_release(struct pcmcia_device *link)
 {
         parport_info_t *info = link->priv;
 
-        DEBUG(0, "parport_release(0x%p)\n", link);
+        dev_dbg(&link->dev, "parport_release\n");
 
         if (info->ndev) {
                 struct parport *p = info->port;
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 8eefe56f1cbe..3f56bc086cb5 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -233,10 +233,10 @@ static int do_hardware_modes (ctl_table *table, int write,
         return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }
 
-#define PARPORT_PORT_DIR(CHILD) { .ctl_name = 0, .procname = NULL, .mode = 0555, .child = CHILD }
-#define PARPORT_PARPORT_DIR(CHILD) { .ctl_name = DEV_PARPORT, .procname = "parport", \
+#define PARPORT_PORT_DIR(CHILD) { .procname = NULL, .mode = 0555, .child = CHILD }
+#define PARPORT_PARPORT_DIR(CHILD) { .procname = "parport", \
                                      .mode = 0555, .child = CHILD }
-#define PARPORT_DEV_DIR(CHILD) { .ctl_name = CTL_DEV, .procname = "dev", .mode = 0555, .child = CHILD }
+#define PARPORT_DEV_DIR(CHILD) { .procname = "dev", .mode = 0555, .child = CHILD }
 #define PARPORT_DEVICES_ROOT_DIR  {  .procname = "devices", \
                                     .mode = 0555, .child = NULL }
 
@@ -270,7 +270,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .data           = NULL,
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
-                        .proc_handler   = &proc_dointvec_minmax,
+                        .proc_handler   = proc_dointvec_minmax,
                         .extra1         = (void*) &parport_min_spintime_value,
                         .extra2         = (void*) &parport_max_spintime_value
                 },
@@ -279,28 +279,28 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_hardware_base_addr
+                        .proc_handler   = do_hardware_base_addr
                 },
                 {
                         .procname       = "irq",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_hardware_irq
+                        .proc_handler   = do_hardware_irq
                 },
                 {
                         .procname       = "dma",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_hardware_dma
+                        .proc_handler   = do_hardware_dma
                 },
                 {
                         .procname       = "modes",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_hardware_modes
+                        .proc_handler   = do_hardware_modes
                 },
                 PARPORT_DEVICES_ROOT_DIR,
 #ifdef CONFIG_PARPORT_1284
@@ -309,35 +309,35 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_autoprobe
+                        .proc_handler   = do_autoprobe
                 },
                 {
                         .procname       = "autoprobe0",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   =  &do_autoprobe
+                        .proc_handler   = do_autoprobe
                 },
                 {
                         .procname       = "autoprobe1",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_autoprobe
+                        .proc_handler   = do_autoprobe
                 },
                 {
                         .procname       = "autoprobe2",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_autoprobe
+                        .proc_handler   = do_autoprobe
                 },
                 {
                         .procname       = "autoprobe3",
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_autoprobe
+                        .proc_handler   = do_autoprobe
                 },
 #endif /* IEEE 1284 support */
                 {}
@@ -348,7 +348,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .data           = NULL,
                         .maxlen         = 0,
                         .mode           = 0444,
-                        .proc_handler   = &do_active_device
+                        .proc_handler   = do_active_device
                 },
                 {}
         },
@@ -386,14 +386,13 @@ parport_device_sysctl_template = {
                         .data           = NULL,
                         .maxlen         = sizeof(unsigned long),
                         .mode           = 0644,
-                        .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
+                        .proc_handler   = proc_doulongvec_ms_jiffies_minmax,
                         .extra1         = (void*) &parport_min_timeslice_value,
                         .extra2         = (void*) &parport_max_timeslice_value
                 },
         },
         {
                 {
-                        .ctl_name       = 0,
                         .procname       = NULL,
                         .data           = NULL,
                         .maxlen         = 0,
@@ -438,7 +437,7 @@ parport_default_sysctl_table = {
                         .data           = &parport_default_timeslice,
                         .maxlen         = sizeof(parport_default_timeslice),
                         .mode           = 0644,
-                        .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
+                        .proc_handler   = proc_doulongvec_ms_jiffies_minmax,
                         .extra1         = (void*) &parport_min_timeslice_value,
                         .extra2         = (void*) &parport_max_timeslice_value
                 },
@@ -447,7 +446,7 @@ parport_default_sysctl_table = {
                         .data           = &parport_default_spintime,
                         .maxlen         = sizeof(parport_default_spintime),
                         .mode           = 0644,
-                        .proc_handler   = &proc_dointvec_minmax,
+                        .proc_handler   = proc_dointvec_minmax,
                         .extra1         = (void*) &parport_min_spintime_value,
                         .extra2         = (void*) &parport_max_spintime_value
                 },
@@ -455,7 +454,6 @@ parport_default_sysctl_table = {
         },
         {
                 {
-                        .ctl_name       = DEV_PARPORT_DEFAULT,
                         .procname       = "default",
                         .mode           = 0555,
                         .child          = parport_default_sysctl_table.vars
@@ -495,7 +493,6 @@ int parport_proc_register(struct parport *port)
                 t->vars[6 + i].extra2 = &port->probe_info[i];
 
         t->port_dir[0].procname = port->name;
-        t->port_dir[0].ctl_name = 0;
 
         t->port_dir[0].child = t->vars;
         t->parport_dir[0].child = t->port_dir;
@@ -534,11 +531,9 @@ int parport_device_proc_register(struct pardevice *device)
         t->dev_dir[0].child = t->parport_dir;
         t->parport_dir[0].child = t->port_dir;
         t->port_dir[0].procname = port->name;
-        t->port_dir[0].ctl_name = 0;
         t->port_dir[0].child = t->devices_root_dir;
         t->devices_root_dir[0].child = t->device_dir;
 
-        t->device_dir[0].ctl_name = 0;
         t->device_dir[0].procname = device->name;
         t->device_dir[0].child = t->vars;
         t->vars[0].data = &device->timeslice;