ata: pata_parport: remove device from struct pi_adapter

device is never set in pata_parport, remove it.

Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Ondrej Zary <linux@zary.sk>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/pata_parport/aten.c b/drivers/ata/pata_parport/aten.c
index 9e6098f90162a66be5866384852459c3804339db..bf83e4188c23aa214d0738e2df0544139df826ec 100644 (file)
--- a/drivers/ata/pata_parport/aten.c
+++ b/drivers/ata/pata_parport/aten.c
@@ -124,8 +124,7 @@ static void aten_log_adapter( PIA *pi, char * scratch, int verbose )
 
 {       char    *mode_string[2] = {"4-bit","8-bit"};
 
-        printk("%s: aten %s, ATEN EH-100 at 0x%x, ",
-                pi->device,ATEN_VERSION,pi->port);
+       printk("aten %s, ATEN EH-100 at 0x%x, ", ATEN_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/bpck.c b/drivers/ata/pata_parport/bpck.c
index 96386a10c22fb8af74c9c1d8b14154ed1278a2b3..c33ca1cb72acb8d6aa78cd3cf895b5a5384ffcf6 100644 (file)
--- a/drivers/ata/pata_parport/bpck.c
+++ b/drivers/ata/pata_parport/bpck.c
@@ -335,8 +335,8 @@ static int bpck_test_proto( PIA *pi, char * scratch, int verbose )
        }
 
        if (verbose) {
-           printk("%s: bpck: 0x%x unit %d mode %d: ",
-                  pi->device,pi->port,pi->unit,pi->mode);
+               printk("bpck: 0x%x unit %d mode %d: ",
+                      pi->port, pi->unit, pi->mode);
            for (i=0;i<TEST_LEN;i++) printk("%3d",buf[i]);
            printk("\n");
        }
@@ -432,13 +432,13 @@ static void bpck_log_adapter( PIA *pi, char * scratch, int verbose )
           for(i=0;i<128;i++)
                if ((scratch[i] < ' ') || (scratch[i] > '~'))
                    scratch[i] = '.';
-          printk("%s: bpck EEPROM: %64.64s\n",pi->device,scratch);
-          printk("%s:              %64.64s\n",pi->device,&scratch[64]);
+          printk("bpck EEPROM: %64.64s\n", scratch);
+          printk("             %64.64s\n", &scratch[64]);
        }
 #endif
 
-       printk("%s: bpck %s, backpack %8.8s unit %d",
-               pi->device,BPCK_VERSION,&scratch[110],pi->unit);
+       printk("bpck %s, backpack %8.8s unit %d",
+               BPCK_VERSION, &scratch[110], pi->unit);
        printk(" at 0x%x, mode %d (%s), delay %d\n",pi->port,
                pi->mode,mode_string[pi->mode],pi->delay);
 }

diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index 3c358e66db257a77766aa64221c3ab7664e5dee1..13bfd60655dd8155050cadcc2cb48c9ec7913ba0 100644 (file)
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -200,11 +200,9 @@ static void bpck6_log_adapter( PIA *pi, char * scratch, int verbose )
        char *mode_string[5]=
                {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
 
-       printk("%s: BACKPACK Protocol Driver V"BACKPACK_VERSION"\n",pi->device);
-       printk("%s: Copyright 2001 by Micro Solutions, Inc., DeKalb IL.\n",pi->device);
-       printk("%s: BACKPACK %s, Micro Solutions BACKPACK Drive at 0x%x\n",
-               pi->device,BACKPACK_VERSION,pi->port);
-       printk("%s: Unit: %d Mode:%d (%s) Delay %d\n",pi->device,
+       printk("BACKPACK %s, Micro Solutions BACKPACK Drive at 0x%x\n",
+               BACKPACK_VERSION, pi->port);
+       printk("Unit: %d Mode:%d (%s) Delay %d\n",
                pi->unit,pi->mode,mode_string[pi->mode],pi->delay);
 }
 
@@ -217,7 +215,7 @@ static int bpck6_init_proto(PIA *pi)
                return 0;
        }
 
-       printk(KERN_ERR "%s: ERROR COULDN'T ALLOCATE MEMORY\n", pi->device); 
+       printk(KERN_ERR "ERROR COULDN'T ALLOCATE MEMORY\n");
        return -1;
 }
 

diff --git a/drivers/ata/pata_parport/comm.c b/drivers/ata/pata_parport/comm.c
index 47f0fbccc3aa0522cc2b5006924c72ac727df51d..908f6c44548b45f1b9580b5d7f803915c7d6d480 100644 (file)
--- a/drivers/ata/pata_parport/comm.c
+++ b/drivers/ata/pata_parport/comm.c
@@ -183,8 +183,7 @@ static void comm_log_adapter( PIA *pi, char * scratch, int verbose )
 
 {       char    *mode_string[5] = {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
 
-        printk("%s: comm %s, DataStor Commuter at 0x%x, ",
-                pi->device,COMM_VERSION,pi->port);
+       printk("comm %s, DataStor Commuter at 0x%x, ", COMM_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/dstr.c b/drivers/ata/pata_parport/dstr.c
index e733a2512e17bb2237ae8dff81af9ecce814c827..3732e9b79429702de2a7d272c0ecb18a96787cc7 100644 (file)
--- a/drivers/ata/pata_parport/dstr.c
+++ b/drivers/ata/pata_parport/dstr.c
@@ -195,8 +195,7 @@ static void dstr_log_adapter( PIA *pi, char * scratch, int verbose )
 {       char    *mode_string[5] = {"4-bit","8-bit","EPP-8",
                                   "EPP-16","EPP-32"};
 
-        printk("%s: dstr %s, DataStor EP2000 at 0x%x, ",
-                pi->device,DSTR_VERSION,pi->port);
+       printk("dstr %s, DataStor EP2000 at 0x%x, ", DSTR_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/epat.c b/drivers/ata/pata_parport/epat.c
index 7583d07083a8b9c06a4683b75c9133366575c7e7..59720daa9c1969ec80d35df49963ab4629d4e343 100644 (file)
--- a/drivers/ata/pata_parport/epat.c
+++ b/drivers/ata/pata_parport/epat.c
@@ -280,8 +280,8 @@ static int epat_test_proto( PIA *pi, char * scratch, int verbose )
         epat_disconnect(pi);
 
         if (verbose)  {
-            printk("%s: epat: port 0x%x, mode %d, ccr %x, test=(%d,%d,%d)\n",
-                  pi->device,pi->port,pi->mode,cc,e[0],e[1],f);
+               printk("epat: port 0x%x, mode %d, ccr %x, test=(%d,%d,%d)\n",
+                      pi->port, pi->mode, cc, e[0], e[1], f);
        }
        
         return (e[0] && e[1]) || f;
@@ -298,8 +298,8 @@ static void epat_log_adapter( PIA *pi, char * scratch, int verbose )
         ver = RR(0xb);
         epat_disconnect(pi);
 
-       printk("%s: epat %s, Shuttle EPAT chip %x at 0x%x, ",
-               pi->device,EPAT_VERSION,ver,pi->port);
+       printk("epat %s, Shuttle EPAT chip %x at 0x%x, ",
+               EPAT_VERSION, ver, pi->port);
        printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/epia.c b/drivers/ata/pata_parport/epia.c
index 2bcb18a6845aa21ad383db38b426a1b6e51733d3..610269083441eaf1540b019673865b9f803be559 100644 (file)
--- a/drivers/ata/pata_parport/epia.c
+++ b/drivers/ata/pata_parport/epia.c
@@ -263,8 +263,8 @@ static int epia_test_proto( PIA *pi, char * scratch, int verbose )
         epia_disconnect(pi);
 
         if (verbose)  {
-            printk("%s: epia: port 0x%x, mode %d, test=(%d,%d,%d)\n",
-                   pi->device,pi->port,pi->mode,e[0],e[1],f);
+               printk("epia: port 0x%x, mode %d, test=(%d,%d,%d)\n",
+                      pi->port, pi->mode, e[0], e[1], f);
         }
         
         return (e[0] && e[1]) || f;
@@ -277,8 +277,7 @@ static void epia_log_adapter( PIA *pi, char * scratch, int verbose )
 {       char    *mode_string[6] = {"4-bit","5/3","8-bit",
                                   "EPP-8","EPP-16","EPP-32"};
 
-        printk("%s: epia %s, Shuttle EPIA at 0x%x, ",
-                pi->device,EPIA_VERSION,pi->port);
+       printk("epia %s, Shuttle EPIA at 0x%x, ", EPIA_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/fit2.c b/drivers/ata/pata_parport/fit2.c
index c63f0cd2ea52805dc8f6ee10a4ce4da3fe24ce02..28de8e4e41c36e51d86257484532f25024b9b7af 100644 (file)
--- a/drivers/ata/pata_parport/fit2.c
+++ b/drivers/ata/pata_parport/fit2.c
@@ -115,8 +115,9 @@ static void fit2_disconnect ( PIA *pi )
 
 static void fit2_log_adapter( PIA *pi, char * scratch, int verbose )
 
-{       printk("%s: fit2 %s, FIT 2000 adapter at 0x%x, delay %d\n",
-                pi->device,FIT2_VERSION,pi->port,pi->delay);
+{
+       printk("fit2 %s, FIT 2000 adapter at 0x%x, delay %d\n",
+               FIT2_VERSION, pi->port, pi->delay);
 
 }
 

diff --git a/drivers/ata/pata_parport/fit3.c b/drivers/ata/pata_parport/fit3.c
index adbef142c88fb8f3ab23538d9454e0fcdc5bd529..0366f31235086e49726b7b511e60b8e3b9847caa 100644 (file)
--- a/drivers/ata/pata_parport/fit3.c
+++ b/drivers/ata/pata_parport/fit3.c
@@ -173,9 +173,9 @@ static void fit3_log_adapter( PIA *pi, char * scratch, int verbose )
 
 {       char    *mode_string[3] = {"4-bit","8-bit","EPP"};
 
-       printk("%s: fit3 %s, FIT 3000 adapter at 0x%x, "
+       printk("fit3 %s, FIT 3000 adapter at 0x%x, "
               "mode %d (%s), delay %d\n",
-                pi->device,FIT3_VERSION,pi->port,
+               FIT3_VERSION, pi->port,
                pi->mode,mode_string[pi->mode],pi->delay);
 
 }

diff --git a/drivers/ata/pata_parport/friq.c b/drivers/ata/pata_parport/friq.c
index e740fe933e2049d8059e6c0061fce3430f61480a..9306a2c78d90f27e0c648c0c8696f56f4f65e218 100644 (file)
--- a/drivers/ata/pata_parport/friq.c
+++ b/drivers/ata/pata_parport/friq.c
@@ -208,8 +208,8 @@ static int friq_test_proto( PIA *pi, char * scratch, int verbose )
        friq_disconnect(pi);
 
         if (verbose)  {
-            printk("%s: friq: port 0x%x, mode %d, test=(%d,%d,%d)\n",
-                   pi->device,pi->port,pi->mode,e[0],e[1],r);
+               printk("friq: port 0x%x, mode %d, test=(%d,%d,%d)\n",
+                      pi->port, pi->mode, e[0], e[1], r);
         }
 
         return (r || (e[0] && e[1]));
@@ -221,7 +221,7 @@ static void friq_log_adapter( PIA *pi, char * scratch, int verbose )
 {       char    *mode_string[6] = {"4-bit","8-bit",
                                   "EPP-8","EPP-16","EPP-32"};
 
-        printk("%s: friq %s, Freecom IQ ASIC-2 adapter at 0x%x, ", pi->device,
+       printk("friq %s, Freecom IQ ASIC-2 adapter at 0x%x, ",
                FRIQ_VERSION,pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);

diff --git a/drivers/ata/pata_parport/frpw.c b/drivers/ata/pata_parport/frpw.c
index 8c8681812bedabe71d4d6c34f1f26f477cf30da6..63f2165fec6369f1c559e05773f1018a481931e5 100644 (file)
--- a/drivers/ata/pata_parport/frpw.c
+++ b/drivers/ata/pata_parport/frpw.c
@@ -231,15 +231,13 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose )
 
        if (((pi->private%2) == 0) && (pi->mode > 2)) {
           if (verbose) 
-               printk("%s: frpw: Xilinx does not support mode %d\n",
-                       pi->device, pi->mode);
+               printk("frpw: Xilinx does not support mode %d\n", pi->mode);
           return 1;
        }
 
        if (((pi->private%2) == 1) && (pi->mode == 2)) {
           if (verbose)
-               printk("%s: frpw: ASIC does not support mode 2\n",
-                       pi->device);
+               printk("frpw: ASIC does not support mode 2\n");
           return 1;
        }
 
@@ -261,8 +259,8 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose )
        frpw_disconnect(pi);
 
         if (verbose)  {
-            printk("%s: frpw: port 0x%x, chip %ld, mode %d, test=(%d,%d,%d)\n",
-                   pi->device,pi->port,(pi->private%2),pi->mode,e[0],e[1],r);
+               printk("frpw: port 0x%x, chip %ld, mode %d, test=(%d,%d,%d)\n",
+                      pi->port, (pi->private%2), pi->mode, e[0], e[1], r);
         }
 
         return (r || (e[0] && e[1]));
@@ -274,7 +272,7 @@ static void frpw_log_adapter( PIA *pi, char * scratch, int verbose )
 {       char    *mode_string[6] = {"4-bit","8-bit","EPP",
                                   "EPP-8","EPP-16","EPP-32"};
 
-        printk("%s: frpw %s, Freecom (%s) adapter at 0x%x, ", pi->device,
+       printk("frpw %s, Freecom (%s) adapter at 0x%x, ",
                FRPW_VERSION,((pi->private%2) == 0)?"Xilinx":"ASIC",pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);

diff --git a/drivers/ata/pata_parport/kbic.c b/drivers/ata/pata_parport/kbic.c
index b120597043cccf04331b58dcfaad7e75fb32ef4d..9a99b9e35d4131965aee9b6f785123e4a66c8915 100644 (file)
--- a/drivers/ata/pata_parport/kbic.c
+++ b/drivers/ata/pata_parport/kbic.c
@@ -235,8 +235,7 @@ static void kbic_log_adapter( PIA *pi, char * scratch,
 {       char    *mode_string[6] = {"4-bit","5/3","8-bit",
                                   "EPP-8","EPP_16","EPP-32"};
 
-        printk("%s: kbic %s, KingByte %s at 0x%x, ",
-                pi->device,KBIC_VERSION,chip,pi->port);
+       printk("kbic %s, KingByte %s at 0x%x, ", KBIC_VERSION, chip, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/ktti.c b/drivers/ata/pata_parport/ktti.c
index 15463cd18968290833db5f758b0cd83224e14fc1..d87eb3c139bce580d958f2a34b61ac250bb8108f 100644 (file)
--- a/drivers/ata/pata_parport/ktti.c
+++ b/drivers/ata/pata_parport/ktti.c
@@ -92,8 +92,9 @@ static void ktti_disconnect ( PIA *pi )
 
 static void ktti_log_adapter( PIA *pi, char * scratch, int verbose )
 
-{       printk("%s: ktti %s, KT adapter at 0x%x, delay %d\n",
-                pi->device,KTTI_VERSION,pi->port,pi->delay);
+{
+       printk("ktti %s, KT adapter at 0x%x, delay %d\n",
+               KTTI_VERSION, pi->port, pi->delay);
 
 }
 

diff --git a/drivers/ata/pata_parport/on20.c b/drivers/ata/pata_parport/on20.c
index f2a601e7784200a59a4d4c5076662521c1cfa3d1..0a1e60e20656b6154d4abc338771fe41409b73fd 100644 (file)
--- a/drivers/ata/pata_parport/on20.c
+++ b/drivers/ata/pata_parport/on20.c
@@ -115,8 +115,7 @@ static void on20_log_adapter( PIA *pi, char * scratch, int verbose )
 
 {       char    *mode_string[2] = {"4-bit","8-bit"};
 
-        printk("%s: on20 %s, OnSpec 90c20 at 0x%x, ",
-                pi->device,ON20_VERSION,pi->port);
+       printk("on20 %s, OnSpec 90c20 at 0x%x, ", ON20_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/drivers/ata/pata_parport/on26.c b/drivers/ata/pata_parport/on26.c
index 66f04015f19a0c3bb9cfb0eac6be38673e3cdd06..ceb5018caeecc8b9ea8cdfc305948559805f2386 100644 (file)
--- a/drivers/ata/pata_parport/on26.c
+++ b/drivers/ata/pata_parport/on26.c
@@ -280,8 +280,7 @@ static void on26_log_adapter( PIA *pi, char * scratch, int verbose )
 {       char    *mode_string[5] = {"4-bit","8-bit","EPP-8",
                                   "EPP-16","EPP-32"};
 
-        printk("%s: on26 %s, OnSpec 90c26 at 0x%x, ",
-                pi->device,ON26_VERSION,pi->port);
+       printk("on26 %s, OnSpec 90c26 at 0x%x, ", ON26_VERSION, pi->port);
         printk("mode %d (%s), delay %d\n",pi->mode,
                mode_string[pi->mode],pi->delay);
 

diff --git a/include/linux/pata_parport.h b/include/linux/pata_parport.h
index 3fc6b002c7c8bc113d4b2579595f8e54370d336b..dcab769aa63931ce9099b4aefa161e417e5930c0 100644 (file)
--- a/include/linux/pata_parport.h
+++ b/include/linux/pata_parport.h
@@ -17,7 +17,6 @@ struct pi_adapter {
        int port;                       /* base address of parallel port */
        int mode;                       /* transfer mode in use */
        int delay;                      /* adapter delay setting */
-       char *device;                   /* dummy for paride protocol modules */
        int unit;                       /* unit number for chained adapters */
        int saved_r0;                   /* saved port state */
        int saved_r2;                   /* saved port state */