From: "Maciej W. Rozycki" Here are a few obvious clean-ups I did to the driver. Signed-off-by: Maciej W. Rozycki Signed-off-by: Andrew Morton --- 25-akpm/drivers/net/defxx.c | 10 +++++----- 25-akpm/drivers/net/defxx.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff -puN drivers/net/defxx.c~defxx-trivial-updates drivers/net/defxx.c --- 25/drivers/net/defxx.c~defxx-trivial-updates Tue Aug 17 14:50:53 2004 +++ 25-akpm/drivers/net/defxx.c Tue Aug 17 14:50:53 2004 @@ -19,7 +19,7 @@ * LVS Lawrence V. Stefani * * Maintainers: - * macro Maciej W. Rozycki + * macro Maciej W. Rozycki * * Credits: * I'd like to thank Patricia Cross for helping me get started with @@ -439,7 +439,7 @@ static int __devinit dfx_init_one_pci_or if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, DRV_NAME)) { printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n", - DRV_NAME, PFI_K_CSR_IO_LEN, ioaddr); + DRV_NAME, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, ioaddr); err = -EBUSY; goto err_out; } @@ -2666,12 +2666,12 @@ static int dfx_hw_dma_uninit(DFX_board_t static void my_skb_align(struct sk_buff *skb, int n) { - unsigned long x=(unsigned long)skb->data; + unsigned long x = (unsigned long)skb->data; unsigned long v; - v=(x+n-1)&~(n-1); /* Where we want to be */ + v = ALIGN(x, n); /* Where we want to be */ - skb_reserve(skb, v-x); + skb_reserve(skb, v - x); } diff -puN drivers/net/defxx.h~defxx-trivial-updates drivers/net/defxx.h --- 25/drivers/net/defxx.h~defxx-trivial-updates Tue Aug 17 14:50:53 2004 +++ 25-akpm/drivers/net/defxx.h Tue Aug 17 14:50:53 2004 @@ -16,7 +16,7 @@ * LVS Lawrence V. Stefani * * Maintainers: - * macro Maciej W. Rozycki + * macro Maciej W. Rozycki * * Modification History: * Date Name Description _