diff options
Diffstat (limited to 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c index afaab07862fb..c1856f7d1e26 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c @@ -30,19 +30,13 @@ #include <linux/netdevice.h> #include <linux/timer.h> #include <linux/delay.h> -#include <asm/io.h> -#include <asm/uaccess.h> +#include <linux/io.h> +#include <linux/uaccess.h> #include <linux/vmalloc.h> #include "ft1000.h" #include "boot.h" -#ifdef FT_DEBUG -#define DEBUG(n, args...) printk(KERN_DEBUG args); -#else -#define DEBUG(n, args...) -#endif - #define MAX_DSP_WAIT_LOOPS 100 #define DSP_WAIT_SLEEP_TIME 1 /* 1 millisecond */ @@ -127,7 +121,7 @@ void card_bootload(struct net_device *dev) u32 i; u32 templong; - DEBUG(0, "card_bootload is called\n"); + netdev_dbg(dev, "card_bootload is called\n"); pdata = (u32 *) bootimage; size = sizeof(bootimage); @@ -174,10 +168,9 @@ u16 get_handshake(struct net_device *dev, u16 expected_value) if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE)) { return handshake; - } else { - loopcnt++; - mdelay(DSP_WAIT_SLEEP_TIME); } + loopcnt++; + mdelay(DSP_WAIT_SLEEP_TIME); } @@ -436,7 +429,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, request = get_request_type(dev); switch (request) { case REQUEST_FILE_CHECKSUM: - DEBUG(0, + netdev_dbg(dev, "ft1000_dnld: REQUEST_FOR_CHECKSUM\n"); put_request_value(dev, image_chksum); break; @@ -651,7 +644,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, (u32) pDspImageInfoV6-> checksum; - DEBUG(0, + netdev_dbg(dev, "ft1000_dnld: image_chksum = 0x%8x\n", (unsigned int) @@ -694,11 +687,11 @@ int card_download(struct net_device *dev, const u8 *pFileStart, || pHdr->portsrc == 0x10 /* FMM */)) { uiState = STATE_SECTION_PROV; } else { - DEBUG(1, + netdev_dbg(dev, "FT1000:download:Download error: Bad Port IDs in Pseudo Record\n"); - DEBUG(1, "\t Port Source = 0x%2.2x\n", + netdev_dbg(dev, "\t Port Source = 0x%2.2x\n", pHdr->portsrc); - DEBUG(1, "\t Port Destination = 0x%2.2x\n", + netdev_dbg(dev, "\t Port Destination = 0x%2.2x\n", pHdr->portdest); Status = FAILURE; } |