projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
net
/
dm9000.c
diff --git
a/drivers/net/dm9000.c
b/drivers/net/dm9000.c
index
8cc1174
..
264fa0e
100644
(file)
--- a/
drivers/net/dm9000.c
+++ b/
drivers/net/dm9000.c
@@
-77,9
+77,6
@@
#define DM9000_PHY 0x40 /* PHY address 0x01 */
#define DM9000_PHY 0x40 /* PHY address 0x01 */
-#define TRUE 1
-#define FALSE 0
-
#define CARDNAME "dm9000"
#define PFX CARDNAME ": "
#define CARDNAME "dm9000"
#define PFX CARDNAME ": "
@@
-601,7
+598,7
@@
dm9000_probe(struct platform_device *pdev)
printk("%s: not found (%d).\n", CARDNAME, ret);
dm9000_release_board(pdev, db);
printk("%s: not found (%d).\n", CARDNAME, ret);
dm9000_release_board(pdev, db);
-
kfree
(ndev);
+
free_netdev
(ndev);
return ret;
}
return ret;
}
@@
-896,7
+893,7
@@
dm9000_rx(struct net_device *dev)
struct dm9000_rxhdr rxhdr;
struct sk_buff *skb;
u8 rxbyte, *rdptr;
struct dm9000_rxhdr rxhdr;
struct sk_buff *skb;
u8 rxbyte, *rdptr;
-
int
GoodPacket;
+
bool
GoodPacket;
int RxLen;
/* Check packet ready or not */
int RxLen;
/* Check packet ready or not */
@@
-918,7
+915,7
@@
dm9000_rx(struct net_device *dev)
return;
/* A packet ready now & Get status/length */
return;
/* A packet ready now & Get status/length */
- GoodPacket =
TRUE
;
+ GoodPacket =
true
;
writeb(DM9000_MRCMD, db->io_addr);
(db->inblk)(db->io_data, &rxhdr, sizeof(rxhdr));
writeb(DM9000_MRCMD, db->io_addr);
(db->inblk)(db->io_data, &rxhdr, sizeof(rxhdr));
@@
-927,7
+924,7
@@
dm9000_rx(struct net_device *dev)
/* Packet Status check */
if (RxLen < 0x40) {
/* Packet Status check */
if (RxLen < 0x40) {
- GoodPacket =
FALSE
;
+ GoodPacket =
false
;
PRINTK1("Bad Packet received (runt)\n");
}
PRINTK1("Bad Packet received (runt)\n");
}
@@
-936,7
+933,7
@@
dm9000_rx(struct net_device *dev)
}
if (rxhdr.RxStatus & 0xbf00) {
}
if (rxhdr.RxStatus & 0xbf00) {
- GoodPacket =
FALSE
;
+ GoodPacket =
false
;
if (rxhdr.RxStatus & 0x100) {
PRINTK1("fifo error\n");
db->stats.rx_fifo_errors++;
if (rxhdr.RxStatus & 0x100) {
PRINTK1("fifo error\n");
db->stats.rx_fifo_errors++;
@@
-1193,7
+1190,7
@@
dm9000_drv_remove(struct platform_device *pdev)
unregister_netdev(ndev);
dm9000_release_board(pdev, (board_info_t *) ndev->priv);
unregister_netdev(ndev);
dm9000_release_board(pdev, (board_info_t *) ndev->priv);
-
kfree(ndev);
/* free device structure */
+
free_netdev(ndev);
/* free device structure */
PRINTK1("clean_module() exit\n");
PRINTK1("clean_module() exit\n");