mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 01:54:09 +08:00
ata: pata_parport: remove scratch parameter from log_adapter()
scratch parameter of log_adapter() is only used by bpck driver. 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:
parent
3a7474ba54
commit
5b77db9ccf
@ -120,7 +120,7 @@ static void aten_disconnect(struct pi_adapter *pi)
|
||||
w2(pi->saved_r2);
|
||||
}
|
||||
|
||||
static void aten_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void aten_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[2] = {"4-bit","8-bit"};
|
||||
|
||||
|
@ -416,11 +416,11 @@ static int bpck_test_port(struct pi_adapter *pi) /* check for 8-bit port */
|
||||
return 5;
|
||||
}
|
||||
|
||||
static void bpck_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void bpck_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[5] = { "4-bit","8-bit","EPP-8",
|
||||
"EPP-16","EPP-32" };
|
||||
|
||||
char scratch[128];
|
||||
#ifdef DUMP_EEPROM
|
||||
int i;
|
||||
#endif
|
||||
|
@ -195,7 +195,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi)
|
||||
}
|
||||
}
|
||||
|
||||
static void bpck6_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void bpck6_log_adapter(struct pi_adapter *pi)
|
||||
{
|
||||
char *mode_string[5]=
|
||||
{"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
|
||||
|
@ -179,7 +179,7 @@ static void comm_write_block(struct pi_adapter *pi, char *buf, int count)
|
||||
}
|
||||
}
|
||||
|
||||
static void comm_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void comm_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
|
||||
|
||||
|
@ -190,7 +190,7 @@ static void dstr_write_block(struct pi_adapter *pi, char *buf, int count)
|
||||
}
|
||||
|
||||
|
||||
static void dstr_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void dstr_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8",
|
||||
"EPP-16","EPP-32"};
|
||||
|
@ -287,7 +287,7 @@ static int epat_test_proto(struct pi_adapter *pi, char *scratch, int verbose)
|
||||
return (e[0] && e[1]) || f;
|
||||
}
|
||||
|
||||
static void epat_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void epat_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ int ver;
|
||||
char *mode_string[6] =
|
||||
|
@ -272,7 +272,7 @@ static int epia_test_proto(struct pi_adapter *pi, char *scratch, int verbose)
|
||||
}
|
||||
|
||||
|
||||
static void epia_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void epia_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[6] = {"4-bit","5/3","8-bit",
|
||||
"EPP-8","EPP-16","EPP-32"};
|
||||
|
@ -113,7 +113,7 @@ static void fit2_disconnect(struct pi_adapter *pi)
|
||||
w2(pi->saved_r2);
|
||||
}
|
||||
|
||||
static void fit2_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void fit2_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{
|
||||
printk("fit2 %s, FIT 2000 adapter at 0x%x, delay %d\n",
|
||||
|
@ -169,7 +169,7 @@ static void fit3_disconnect(struct pi_adapter *pi)
|
||||
w2(pi->saved_r2);
|
||||
}
|
||||
|
||||
static void fit3_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void fit3_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[3] = {"4-bit","8-bit","EPP"};
|
||||
|
||||
|
@ -216,7 +216,7 @@ static int friq_test_proto(struct pi_adapter *pi, char *scratch, int verbose)
|
||||
}
|
||||
|
||||
|
||||
static void friq_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void friq_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[6] = {"4-bit","8-bit",
|
||||
"EPP-8","EPP-16","EPP-32"};
|
||||
|
@ -267,7 +267,7 @@ static int frpw_test_proto(struct pi_adapter *pi, char *scratch, int verbose)
|
||||
}
|
||||
|
||||
|
||||
static void frpw_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void frpw_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[6] = {"4-bit","8-bit","EPP",
|
||||
"EPP-8","EPP-16","EPP-32"};
|
||||
|
@ -229,7 +229,7 @@ static void kbic_write_block(struct pi_adapter *pi, char *buf, int count)
|
||||
|
||||
}
|
||||
|
||||
static void kbic_log_adapter(struct pi_adapter *pi, char *scratch, char *chip)
|
||||
static void kbic_log_adapter(struct pi_adapter *pi, char *chip)
|
||||
|
||||
{ char *mode_string[6] = {"4-bit","5/3","8-bit",
|
||||
"EPP-8","EPP_16","EPP-32"};
|
||||
@ -240,14 +240,14 @@ static void kbic_log_adapter(struct pi_adapter *pi, char *scratch, char *chip)
|
||||
|
||||
}
|
||||
|
||||
static void k951_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void k951_log_adapter(struct pi_adapter *pi)
|
||||
{
|
||||
kbic_log_adapter(pi, scratch, "KBIC-951A");
|
||||
kbic_log_adapter(pi, "KBIC-951A");
|
||||
}
|
||||
|
||||
static void k971_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void k971_log_adapter(struct pi_adapter *pi)
|
||||
{
|
||||
kbic_log_adapter(pi, scratch, "KBIC-971A");
|
||||
kbic_log_adapter(pi, "KBIC-971A");
|
||||
}
|
||||
|
||||
static struct pi_protocol k951 = {
|
||||
|
@ -90,7 +90,7 @@ static void ktti_disconnect(struct pi_adapter *pi)
|
||||
w2(pi->saved_r2);
|
||||
}
|
||||
|
||||
static void ktti_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void ktti_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{
|
||||
printk("ktti %s, KT adapter at 0x%x, delay %d\n",
|
||||
|
@ -111,7 +111,7 @@ static void on20_write_block(struct pi_adapter *pi, char *buf, int count)
|
||||
w2(4);
|
||||
}
|
||||
|
||||
static void on20_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void on20_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[2] = {"4-bit","8-bit"};
|
||||
|
||||
|
@ -275,7 +275,7 @@ static void on26_write_block(struct pi_adapter *pi, char *buf, int count)
|
||||
|
||||
}
|
||||
|
||||
static void on26_log_adapter(struct pi_adapter *pi, char *scratch)
|
||||
static void on26_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8",
|
||||
"EPP-16","EPP-32"};
|
||||
|
@ -478,7 +478,7 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
|
||||
goto out_unreg_parport;
|
||||
}
|
||||
|
||||
pi->proto->log_adapter(pi, scratch);
|
||||
pi->proto->log_adapter(pi);
|
||||
|
||||
host = ata_host_alloc_pinfo(&pi->pardev->dev, ppi, 1);
|
||||
if (!host)
|
||||
|
@ -68,7 +68,7 @@ struct pi_protocol {
|
||||
int (*test_port)(struct pi_adapter *pi);
|
||||
int (*probe_unit)(struct pi_adapter *pi);
|
||||
int (*test_proto)(struct pi_adapter *pi, char *scratch, int verbose);
|
||||
void (*log_adapter)(struct pi_adapter *pi, char *scratch);
|
||||
void (*log_adapter)(struct pi_adapter *pi);
|
||||
|
||||
int (*init_proto)(struct pi_adapter *pi);
|
||||
void (*release_proto)(struct pi_adapter *pi);
|
||||
|
Loading…
Reference in New Issue
Block a user