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>

diff --git a/drivers/ata/pata_parport/aten.c b/drivers/ata/pata_parport/aten.c
index ccbba14ccab107a2ecc2eb36d6fe082cf684d750..8995a4a08b76e3245efc164db782dfc9aa8b887b 100644 (file)
--- a/drivers/ata/pata_parport/aten.c
+++ b/drivers/ata/pata_parport/aten.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/bpck.c b/drivers/ata/pata_parport/bpck.c
index dec24983d1409d408e8ebad87220c1fa92f82ff5..793ef2c7849ed98993c5d0e86f7bcdc33022e07d 100644 (file)
--- a/drivers/ata/pata_parport/bpck.c
+++ b/drivers/ata/pata_parport/bpck.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index 4770e29bfdeb430725698541281b644655bf336f..f144e1b3cacb7fa9763c19114d4f8aeb5f880270 100644 (file)
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -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)

diff --git a/drivers/ata/pata_parport/comm.c b/drivers/ata/pata_parport/comm.c
index 7b59eca52185c76f2de414fe59a8c27209942a8a..6e05b50c322c7ec72f09f797a2ef0aaecca035a2 100644 (file)
--- a/drivers/ata/pata_parport/comm.c
+++ b/drivers/ata/pata_parport/comm.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/dstr.c b/drivers/ata/pata_parport/dstr.c
index eb6ddceaeb839cc5a7ff19dbd6d0074cd06795fd..64e45eed958818adffc4e066f5fbfcfbdd063dd5 100644 (file)
--- a/drivers/ata/pata_parport/dstr.c
+++ b/drivers/ata/pata_parport/dstr.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/epat.c b/drivers/ata/pata_parport/epat.c
index 389faa6ae49d0a4e6ab9957f2a7752693f2cc78c..12dd53a06dd0b449efd5b6d47ed701cd2766335d 100644 (file)
--- a/drivers/ata/pata_parport/epat.c
+++ b/drivers/ata/pata_parport/epat.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/epia.c b/drivers/ata/pata_parport/epia.c
index 48d12f56c5017fed64eca263e71ed2f66a650e4c..1216763d0c6d451cd4bcd5f2013d98394322f8f8 100644 (file)
--- a/drivers/ata/pata_parport/epia.c
+++ b/drivers/ata/pata_parport/epia.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/fit2.c b/drivers/ata/pata_parport/fit2.c
index d0a781f04411a39292596e30d0e66f71fcff1e05..3536d8c07955f1fe4a3c94fa865645ed0f51f137 100644 (file)
--- a/drivers/ata/pata_parport/fit2.c
+++ b/drivers/ata/pata_parport/fit2.c
@@ -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);
 
 }
 

diff --git a/drivers/ata/pata_parport/fit3.c b/drivers/ata/pata_parport/fit3.c
index f86da2d478cbbb1d4fe699f952a7dffb03899c9c..9f5320c750e29ac1823ac688415fe30495e021c6 100644 (file)
--- a/drivers/ata/pata_parport/fit3.c
+++ b/drivers/ata/pata_parport/fit3.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/friq.c b/drivers/ata/pata_parport/friq.c
index ec564e7cb9308d20b1261f93e321165bd2d4d4a4..ed05e6503147ac2616a3488f140c95750a24b751 100644 (file)
--- a/drivers/ata/pata_parport/friq.c
+++ b/drivers/ata/pata_parport/friq.c
@@ -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);

diff --git a/drivers/ata/pata_parport/frpw.c b/drivers/ata/pata_parport/frpw.c
index 5ea16a247257897e6f5fcbd82f63b9b5f2f7cf58..c0d50e2ed57d05253371006ba8415a58a8674243 100644 (file)
--- a/drivers/ata/pata_parport/frpw.c
+++ b/drivers/ata/pata_parport/frpw.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/kbic.c b/drivers/ata/pata_parport/kbic.c
index ea1b931ce20dadab6ade7e407efe779293c81f88..3fab7a896e7963e291a0edbc03678e006dd7696e 100644 (file)
--- a/drivers/ata/pata_parport/kbic.c
+++ b/drivers/ata/pata_parport/kbic.c
@@ -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)

diff --git a/drivers/ata/pata_parport/ktti.c b/drivers/ata/pata_parport/ktti.c
index b22c283709dec1b3067727ff894825f592571880..742051f6ea10dd6bf390900c82b2783dcf0fcbf5 100644 (file)
--- a/drivers/ata/pata_parport/ktti.c
+++ b/drivers/ata/pata_parport/ktti.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/on20.c b/drivers/ata/pata_parport/on20.c
index c76d4fb84c6113268f18ef63e52bf761d20bb621..9cc8be9fa56290084a615c6e3516d7027a55cea4 100644 (file)
--- a/drivers/ata/pata_parport/on20.c
+++ b/drivers/ata/pata_parport/on20.c
@@ -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 = {

diff --git a/drivers/ata/pata_parport/on26.c b/drivers/ata/pata_parport/on26.c
index 5406e76ea7277308e14d42fc1904bd1a1bddd704..e37f69db5f76958c4377952521e78db964d0c0b8 100644 (file)
--- a/drivers/ata/pata_parport/on26.c
+++ b/drivers/ata/pata_parport/on26.c
@@ -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 = {