Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51ba0ed1 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by David S. Miller
Browse files

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: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 284a83a0

drivers/net/fddi/defxx.c

+10 −11
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/fddi/defxx.h

+1 −1
Original line number Diff line number Diff line
@@ -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