defxx: Fix issues with debug printk calls

This fixes issues with debug printk calls across the driver, normally
disabled; first compilation errors:

drivers/net/fddi/defxx.c:676:1: error: pasting "(" and ""In dfx_bus_init...\n"" does not give a valid preprocessing token
drivers/net/fddi/defxx.c:820:1: error: pasting "(" and ""In dfx_bus_uninit...\n"" does not give a valid preprocessing token

and so on, and then warnings:

drivers/net/fddi/defxx.c: In function 'dfx_driver_init':
drivers/net/fddi/defxx.c:1132: warning: format '%0X' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'
drivers/net/fddi/defxx.c:1132: warning: format '%0X' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'

etc.  Additionally casts are removed from virtual addresses and %p used.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 3d1a878a4ab0d6f2a7abfec59c5d35780d27405c..6ea59ece7e0b49d78155e8cb184db1a50251cfd7 100644 (file)
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -1123,17 +1123,16 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
 
        /* Display virtual and physical addresses if debug driver */
 
-       DBG_printk("%s: Descriptor block virt = %0lX, phys = %0X\n",
-                  print_name,
-                  (long)bp->descr_block_virt, bp->descr_block_phys);
-       DBG_printk("%s: Command Request buffer virt = %0lX, phys = %0X\n",
-                  print_name, (long)bp->cmd_req_virt, bp->cmd_req_phys);
-       DBG_printk("%s: Command Response buffer virt = %0lX, phys = %0X\n",
-                  print_name, (long)bp->cmd_rsp_virt, bp->cmd_rsp_phys);
-       DBG_printk("%s: Receive buffer block virt = %0lX, phys = %0X\n",
-                  print_name, (long)bp->rcv_block_virt, bp->rcv_block_phys);
-       DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n",
-                  print_name, (long)bp->cons_block_virt, bp->cons_block_phys);
+       DBG_printk("%s: Descriptor block virt = %p, phys = %pad\n",
+                  print_name, bp->descr_block_virt, &bp->descr_block_phys);
+       DBG_printk("%s: Command Request buffer virt = %p, phys = %pad\n",
+                  print_name, bp->cmd_req_virt, &bp->cmd_req_phys);
+       DBG_printk("%s: Command Response buffer virt = %p, phys = %pad\n",
+                  print_name, bp->cmd_rsp_virt, &bp->cmd_rsp_phys);
+       DBG_printk("%s: Receive buffer block virt = %p, phys = %pad\n",
+                  print_name, bp->rcv_block_virt, &bp->rcv_block_phys);
+       DBG_printk("%s: Consumer block virt = %p, phys = %pad\n",
+                  print_name, bp->cons_block_virt, &bp->cons_block_phys);
 
        return DFX_K_SUCCESS;
 }

diff --git a/drivers/net/fddi/defxx.h b/drivers/net/fddi/defxx.h
index 19a6f64df1984b77d85046895fb39d92e584b1b5..adb63f3f7b4a32b093c82cf29cf222db68c8acd7 100644 (file)
--- a/drivers/net/fddi/defxx.h
+++ b/drivers/net/fddi/defxx.h
@@ -1693,7 +1693,7 @@ typedef union
 /* Only execute special print call when debug driver was built */
 
 #ifdef DEFXX_DEBUG
-#define DBG_printk(args...) printk(## args)
+#define DBG_printk(args...) printk(args)
 #else
 #define DBG_printk(args...)
 #endif