mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 01:54:09 +08:00
ata: pata_parport: simplify log_adapter prints, remove VERSION defines
Merge log_adapter prints to single one, remove version print and meaningless VERSION defines. 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
68f28e4177
commit
426eb3c567
@ -15,8 +15,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define ATEN_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -124,10 +122,8 @@ static void aten_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[2] = {"4-bit","8-bit"};
|
||||
|
||||
dev_info(&pi->dev, "aten %s, ATEN EH-100 at 0x%x, ", ATEN_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "ATEN EH-100 at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol aten = {
|
||||
|
@ -14,8 +14,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define BPCK_VERSION "1.02"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -421,10 +419,9 @@ static void bpck_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
bpck_read_eeprom(pi,scratch);
|
||||
print_hex_dump_bytes("bpck EEPROM: ", DUMP_PREFIX_NONE, scratch, 128);
|
||||
dev_info(&pi->dev, "bpck %s, backpack %8.8s unit %d",
|
||||
BPCK_VERSION, &scratch[110], pi->unit);
|
||||
dev_info(&pi->dev, " at 0x%x, mode %d (%s), delay %d\n", pi->port,
|
||||
pi->mode,mode_string[pi->mode],pi->delay);
|
||||
dev_info(&pi->dev, "backpack %8.8s unit %d at 0x%x, mode %d (%s), delay %d\n",
|
||||
&scratch[110], pi->unit, pi->port, pi->mode,
|
||||
mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol bpck = {
|
||||
|
@ -19,9 +19,6 @@
|
||||
Version 2.0.2 - fixed version string usage, and made ppc functions static
|
||||
*/
|
||||
|
||||
|
||||
#define BACKPACK_VERSION "2.0.2"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
@ -179,10 +176,8 @@ static void bpck6_log_adapter(struct pi_adapter *pi)
|
||||
char *mode_string[5]=
|
||||
{"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "BACKPACK %s, Micro Solutions BACKPACK Drive at 0x%x\n",
|
||||
BACKPACK_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "Unit: %d Mode:%d (%s) Delay %d\n",
|
||||
pi->unit,pi->mode,mode_string[pi->mode],pi->delay);
|
||||
dev_info(&pi->dev, "Micro Solutions BACKPACK Drive unit %d at 0x%x, mode:%d (%s), delay %d\n",
|
||||
pi->unit, pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static int bpck6_init_proto(struct pi_adapter *pi)
|
||||
|
@ -14,8 +14,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define COMM_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -183,10 +181,8 @@ static void comm_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8","EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "comm %s, DataStor Commuter at 0x%x, ", COMM_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "DataStor Commuter at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol comm = {
|
||||
|
@ -13,8 +13,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define DSTR_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -195,10 +193,8 @@ static void dstr_log_adapter(struct pi_adapter *pi)
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8",
|
||||
"EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "dstr %s, DataStor EP2000 at 0x%x, ", DSTR_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "DataStor EP2000 at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol dstr = {
|
||||
|
@ -16,8 +16,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define EPAT_VERSION "1.02"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -296,11 +294,8 @@ static void epat_log_adapter(struct pi_adapter *pi)
|
||||
ver = RR(0xb);
|
||||
epat_disconnect(pi);
|
||||
|
||||
dev_info(&pi->dev, "epat %s, Shuttle EPAT chip %x at 0x%x, ",
|
||||
EPAT_VERSION, ver, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "Shuttle EPAT chip %x at 0x%x, mode %d (%s), delay %d\n",
|
||||
ver, pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol epat = {
|
||||
|
@ -17,8 +17,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define EPIA_VERSION "1.02"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -275,10 +273,8 @@ 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"};
|
||||
|
||||
dev_info(&pi->dev, "epia %s, Shuttle EPIA at 0x%x, ", EPIA_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "Shuttle EPIA at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol epia = {
|
||||
|
@ -13,8 +13,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define FIT2_VERSION "1.0"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -116,8 +114,8 @@ static void fit2_disconnect(struct pi_adapter *pi)
|
||||
static void fit2_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{
|
||||
dev_info(&pi->dev, "fit2 %s, FIT 2000 adapter at 0x%x, delay %d\n",
|
||||
FIT2_VERSION, pi->port, pi->delay);
|
||||
dev_info(&pi->dev, "FIT 2000 adapter at 0x%x, delay %d\n",
|
||||
pi->port, pi->delay);
|
||||
|
||||
}
|
||||
|
||||
|
@ -17,8 +17,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define FIT3_VERSION "1.0"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -173,11 +171,8 @@ static void fit3_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[3] = {"4-bit","8-bit","EPP"};
|
||||
|
||||
dev_info(&pi->dev, "fit3 %s, FIT 3000 adapter at 0x%x, "
|
||||
"mode %d (%s), delay %d\n",
|
||||
FIT3_VERSION, pi->port,
|
||||
pi->mode,mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "FIT 3000 adapter at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol fit3 = {
|
||||
|
@ -25,8 +25,6 @@
|
||||
1.01 GRG 1998.12.20 Added support for soft power switch
|
||||
*/
|
||||
|
||||
#define FRIQ_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -219,10 +217,8 @@ static void friq_log_adapter(struct pi_adapter *pi)
|
||||
{ char *mode_string[6] = {"4-bit","8-bit",
|
||||
"EPP-8","EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "friq %s, Freecom IQ ASIC-2 adapter at 0x%x, ",
|
||||
FRIQ_VERSION,pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
dev_info(&pi->dev, "Freecom IQ ASIC-2 adapter at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
|
||||
pi->private = 1;
|
||||
friq_connect(pi);
|
||||
|
@ -23,8 +23,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define FRPW_VERSION "1.03"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -268,11 +266,9 @@ static void frpw_log_adapter(struct pi_adapter *pi)
|
||||
{ char *mode_string[6] = {"4-bit","8-bit","EPP",
|
||||
"EPP-8","EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "frpw %s, Freecom (%s) adapter at 0x%x, ",
|
||||
FRPW_VERSION,((pi->private%2) == 0)?"Xilinx":"ASIC",pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "Freecom (%s) adapter at 0x%x, mode %d (%s), delay %d\n",
|
||||
((pi->private % 2) == 0) ? "Xilinx" : "ASIC",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol frpw = {
|
||||
|
@ -18,8 +18,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define KBIC_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -234,10 +232,8 @@ 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"};
|
||||
|
||||
dev_info(&pi->dev, "kbic %s, KingByte %s at 0x%x, ", KBIC_VERSION, chip, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "KingByte %s at 0x%x, mode %d (%s), delay %d\n",
|
||||
chip, pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static void k951_log_adapter(struct pi_adapter *pi)
|
||||
|
@ -9,8 +9,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define KTTI_VERSION "1.0"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -93,9 +91,8 @@ static void ktti_disconnect(struct pi_adapter *pi)
|
||||
static void ktti_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{
|
||||
dev_info(&pi->dev, "ktti %s, KT adapter at 0x%x, delay %d\n",
|
||||
KTTI_VERSION, pi->port, pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "KT adapter at 0x%x, delay %d\n",
|
||||
pi->port, pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol ktti = {
|
||||
|
@ -12,8 +12,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define ON20_VERSION "1.01"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -115,10 +113,8 @@ static void on20_log_adapter(struct pi_adapter *pi)
|
||||
|
||||
{ char *mode_string[2] = {"4-bit","8-bit"};
|
||||
|
||||
dev_info(&pi->dev, "on20 %s, OnSpec 90c20 at 0x%x, ", ON20_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "OnSpec 90c20 at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol on20 = {
|
||||
|
@ -16,8 +16,6 @@
|
||||
|
||||
*/
|
||||
|
||||
#define ON26_VERSION "1.04"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
@ -280,10 +278,8 @@ static void on26_log_adapter(struct pi_adapter *pi)
|
||||
{ char *mode_string[5] = {"4-bit","8-bit","EPP-8",
|
||||
"EPP-16","EPP-32"};
|
||||
|
||||
dev_info(&pi->dev, "on26 %s, OnSpec 90c26 at 0x%x, ", ON26_VERSION, pi->port);
|
||||
dev_info(&pi->dev, "mode %d (%s), delay %d\n", pi->mode,
|
||||
mode_string[pi->mode],pi->delay);
|
||||
|
||||
dev_info(&pi->dev, "OnSpec 90c26 at 0x%x, mode %d (%s), delay %d\n",
|
||||
pi->port, pi->mode, mode_string[pi->mode], pi->delay);
|
||||
}
|
||||
|
||||
static struct pi_protocol on26 = {
|
||||
|
Loading…
Reference in New Issue
Block a user