UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ondrej Zary 2023-02-18 23:01:27 +01:00 committed by Damien Le Moal
parent ec6e7a51d9
commit a4f2ff92ed
16 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ata/pata_parport/aten.c
View File

@ -124,8 +124,7 @@ static void aten_log_adapter( PIA *pi, char * scratch, int verbose )
{ char *mode_string[2] = {"4-bit","8-bit"}; { char *mode_string[2] = {"4-bit","8-bit"};
printk("%s: aten %s, ATEN EH-100 at 0x%x, ", printk("aten %s, ATEN EH-100 at 0x%x, ", ATEN_VERSION, pi->port);
pi->device,ATEN_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

12
drivers/ata/pata_parport/bpck.c
View File

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

10
drivers/ata/pata_parport/bpck6.c
View File

@ -200,11 +200,9 @@ static void bpck6_log_adapter( PIA *pi, char * scratch, int verbose )
char *mode_string[5]= char *mode_string[5]=
{"4-bit","8-bit","EPP-8","EPP-16","EPP-32"}; {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
printk("%s: BACKPACK Protocol Driver V"BACKPACK_VERSION"\n",pi->device); printk("BACKPACK %s, Micro Solutions BACKPACK Drive at 0x%x\n",
printk("%s: Copyright 2001 by Micro Solutions, Inc., DeKalb IL.\n",pi->device); BACKPACK_VERSION, pi->port);
printk("%s: BACKPACK %s, Micro Solutions BACKPACK Drive at 0x%x\n", printk("Unit: %d Mode:%d (%s) Delay %d\n",
pi->device,BACKPACK_VERSION,pi->port);
printk("%s: Unit: %d Mode:%d (%s) Delay %d\n",pi->device,
pi->unit,pi->mode,mode_string[pi->mode],pi->delay); pi->unit,pi->mode,mode_string[pi->mode],pi->delay);
} }
@ -217,7 +215,7 @@ static int bpck6_init_proto(PIA *pi)
return 0; 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; return -1;
} }

3
drivers/ata/pata_parport/comm.c
View File

@ -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"}; { char *mode_string[5] = {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
printk("%s: comm %s, DataStor Commuter at 0x%x, ", printk("comm %s, DataStor Commuter at 0x%x, ", COMM_VERSION, pi->port);
pi->device,COMM_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

3
drivers/ata/pata_parport/dstr.c
View File

@ -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", { char *mode_string[5] = {"4-bit","8-bit","EPP-8",
"EPP-16","EPP-32"}; "EPP-16","EPP-32"};
printk("%s: dstr %s, DataStor EP2000 at 0x%x, ", printk("dstr %s, DataStor EP2000 at 0x%x, ", DSTR_VERSION, pi->port);
pi->device,DSTR_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

8
drivers/ata/pata_parport/epat.c
View File

@ -280,8 +280,8 @@ static int epat_test_proto( PIA *pi, char * scratch, int verbose )
epat_disconnect(pi); epat_disconnect(pi);
if (verbose) { if (verbose) {
printk("%s: epat: port 0x%x, mode %d, ccr %x, test=(%d,%d,%d)\n", printk("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); pi->port, pi->mode, cc, e[0], e[1], f);
} }
return (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); ver = RR(0xb);
epat_disconnect(pi); epat_disconnect(pi);
printk("%s: epat %s, Shuttle EPAT chip %x at 0x%x, ", printk("epat %s, Shuttle EPAT chip %x at 0x%x, ",
pi->device,EPAT_VERSION,ver,pi->port); EPAT_VERSION, ver, pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

7
drivers/ata/pata_parport/epia.c
View File

@ -263,8 +263,8 @@ static int epia_test_proto( PIA *pi, char * scratch, int verbose )
epia_disconnect(pi); epia_disconnect(pi);
if (verbose) { if (verbose) {
printk("%s: epia: port 0x%x, mode %d, test=(%d,%d,%d)\n", printk("epia: port 0x%x, mode %d, test=(%d,%d,%d)\n",
pi->device,pi->port,pi->mode,e[0],e[1],f); pi->port, pi->mode, e[0], e[1], f);
} }
return (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", { char *mode_string[6] = {"4-bit","5/3","8-bit",
"EPP-8","EPP-16","EPP-32"}; "EPP-8","EPP-16","EPP-32"};
printk("%s: epia %s, Shuttle EPIA at 0x%x, ", printk("epia %s, Shuttle EPIA at 0x%x, ", EPIA_VERSION, pi->port);
pi->device,EPIA_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

5
drivers/ata/pata_parport/fit2.c
View File

@ -115,8 +115,9 @@ static void fit2_disconnect ( PIA *pi )
static void fit2_log_adapter( PIA *pi, char * scratch, int verbose ) 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);
} }

4
drivers/ata/pata_parport/fit3.c
View File

@ -173,9 +173,9 @@ static void fit3_log_adapter( PIA *pi, char * scratch, int verbose )
{ char *mode_string[3] = {"4-bit","8-bit","EPP"}; { 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", "mode %d (%s), delay %d\n",
pi->device,FIT3_VERSION,pi->port, FIT3_VERSION, pi->port,
pi->mode,mode_string[pi->mode],pi->delay); pi->mode,mode_string[pi->mode],pi->delay);
} }

6
drivers/ata/pata_parport/friq.c
View File

@ -208,8 +208,8 @@ static int friq_test_proto( PIA *pi, char * scratch, int verbose )
friq_disconnect(pi); friq_disconnect(pi);
if (verbose) { if (verbose) {
printk("%s: friq: port 0x%x, mode %d, test=(%d,%d,%d)\n", printk("friq: port 0x%x, mode %d, test=(%d,%d,%d)\n",
pi->device,pi->port,pi->mode,e[0],e[1],r); pi->port, pi->mode, e[0], e[1], r);
} }
return (r || (e[0] && e[1])); 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", { char *mode_string[6] = {"4-bit","8-bit",
"EPP-8","EPP-16","EPP-32"}; "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); FRIQ_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

12
drivers/ata/pata_parport/frpw.c
View File

@ -231,15 +231,13 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose )
if (((pi->private%2) == 0) && (pi->mode > 2)) { if (((pi->private%2) == 0) && (pi->mode > 2)) {
if (verbose) if (verbose)
printk("%s: frpw: Xilinx does not support mode %d\n", printk("frpw: Xilinx does not support mode %d\n", pi->mode);
pi->device, pi->mode);
return 1; return 1;
} }
if (((pi->private%2) == 1) && (pi->mode == 2)) { if (((pi->private%2) == 1) && (pi->mode == 2)) {
if (verbose) if (verbose)
printk("%s: frpw: ASIC does not support mode 2\n", printk("frpw: ASIC does not support mode 2\n");
pi->device);
return 1; return 1;
} }
@ -261,8 +259,8 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose )
frpw_disconnect(pi); frpw_disconnect(pi);
if (verbose) { if (verbose) {
printk("%s: frpw: port 0x%x, chip %ld, mode %d, test=(%d,%d,%d)\n", printk("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); pi->port, (pi->private%2), pi->mode, e[0], e[1], r);
} }
return (r || (e[0] && e[1])); 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", { char *mode_string[6] = {"4-bit","8-bit","EPP",
"EPP-8","EPP-16","EPP-32"}; "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); FRPW_VERSION,((pi->private%2) == 0)?"Xilinx":"ASIC",pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

3
drivers/ata/pata_parport/kbic.c
View File

@ -235,8 +235,7 @@ static void kbic_log_adapter( PIA *pi, char * scratch,
{ char *mode_string[6] = {"4-bit","5/3","8-bit", { char *mode_string[6] = {"4-bit","5/3","8-bit",
"EPP-8","EPP_16","EPP-32"}; "EPP-8","EPP_16","EPP-32"};
printk("%s: kbic %s, KingByte %s at 0x%x, ", printk("kbic %s, KingByte %s at 0x%x, ", KBIC_VERSION, chip, pi->port);
pi->device,KBIC_VERSION,chip,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

5
drivers/ata/pata_parport/ktti.c
View File

@ -92,8 +92,9 @@ static void ktti_disconnect ( PIA *pi )
static void ktti_log_adapter( PIA *pi, char * scratch, int verbose ) 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);
} }

3
drivers/ata/pata_parport/on20.c
View File

@ -115,8 +115,7 @@ static void on20_log_adapter( PIA *pi, char * scratch, int verbose )
{ char *mode_string[2] = {"4-bit","8-bit"}; { char *mode_string[2] = {"4-bit","8-bit"};
printk("%s: on20 %s, OnSpec 90c20 at 0x%x, ", printk("on20 %s, OnSpec 90c20 at 0x%x, ", ON20_VERSION, pi->port);
pi->device,ON20_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

3
drivers/ata/pata_parport/on26.c
View File

@ -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", { char *mode_string[5] = {"4-bit","8-bit","EPP-8",
"EPP-16","EPP-32"}; "EPP-16","EPP-32"};
printk("%s: on26 %s, OnSpec 90c26 at 0x%x, ", printk("on26 %s, OnSpec 90c26 at 0x%x, ", ON26_VERSION, pi->port);
pi->device,ON26_VERSION,pi->port);
printk("mode %d (%s), delay %d\n",pi->mode, printk("mode %d (%s), delay %d\n",pi->mode,
mode_string[pi->mode],pi->delay); mode_string[pi->mode],pi->delay);

1
include/linux/pata_parport.h
View File

@ -17,7 +17,6 @@ struct pi_adapter {
int port; /* base address of parallel port */ int port; /* base address of parallel port */
int mode; /* transfer mode in use */ int mode; /* transfer mode in use */
int delay; /* adapter delay setting */ int delay; /* adapter delay setting */
char *device; /* dummy for paride protocol modules */
int unit; /* unit number for chained adapters */ int unit; /* unit number for chained adapters */
int saved_r0; /* saved port state */ int saved_r0; /* saved port state */
int saved_r2; /* saved port state */ int saved_r2; /* saved port state */