|
@@ -109,8 +109,8 @@ typedef struct board_info {
|
|
|
u8 imr_all;
|
|
|
|
|
|
unsigned int flags;
|
|
|
- unsigned int in_suspend :1;
|
|
|
- unsigned int wake_supported :1;
|
|
|
+ unsigned int in_suspend:1;
|
|
|
+ unsigned int wake_supported:1;
|
|
|
|
|
|
enum dm9000_type type;
|
|
|
|
|
@@ -161,7 +161,7 @@ static inline board_info_t *to_dm9000_board(struct net_device *dev)
|
|
|
* Read a byte from I/O port
|
|
|
*/
|
|
|
static u8
|
|
|
-ior(board_info_t * db, int reg)
|
|
|
+ior(board_info_t *db, int reg)
|
|
|
{
|
|
|
writeb(reg, db->io_addr);
|
|
|
return readb(db->io_data);
|
|
@@ -172,7 +172,7 @@ ior(board_info_t * db, int reg)
|
|
|
*/
|
|
|
|
|
|
static void
|
|
|
-iow(board_info_t * db, int reg, int value)
|
|
|
+iow(board_info_t *db, int reg, int value)
|
|
|
{
|
|
|
writeb(reg, db->io_addr);
|
|
|
writeb(value, db->io_data);
|
|
@@ -744,9 +744,9 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
|
|
|
.get_link = dm9000_get_link,
|
|
|
.get_wol = dm9000_get_wol,
|
|
|
.set_wol = dm9000_set_wol,
|
|
|
- .get_eeprom_len = dm9000_get_eeprom_len,
|
|
|
- .get_eeprom = dm9000_get_eeprom,
|
|
|
- .set_eeprom = dm9000_set_eeprom,
|
|
|
+ .get_eeprom_len = dm9000_get_eeprom_len,
|
|
|
+ .get_eeprom = dm9000_get_eeprom,
|
|
|
+ .set_eeprom = dm9000_set_eeprom,
|
|
|
};
|
|
|
|
|
|
static void dm9000_show_carrier(board_info_t *db,
|
|
@@ -794,7 +794,7 @@ dm9000_poll_work(struct work_struct *w)
|
|
|
}
|
|
|
} else
|
|
|
mii_check_media(&db->mii, netif_msg_link(db), 0);
|
|
|
-
|
|
|
+
|
|
|
if (netif_running(ndev))
|
|
|
dm9000_schedule_poll(db);
|
|
|
}
|
|
@@ -1251,12 +1251,11 @@ static irqreturn_t dm9000_wol_interrupt(int irq, void *dev_id)
|
|
|
dev_info(db->dev, "wake by link status change\n");
|
|
|
if (wcr & WCR_SAMPLEST)
|
|
|
dev_info(db->dev, "wake by sample packet\n");
|
|
|
- if (wcr & WCR_MAGICST )
|
|
|
+ if (wcr & WCR_MAGICST)
|
|
|
dev_info(db->dev, "wake by magic packet\n");
|
|
|
if (!(wcr & (WCR_LINKST | WCR_SAMPLEST | WCR_MAGICST)))
|
|
|
dev_err(db->dev, "wake signalled with no reason? "
|
|
|
"NSR=0x%02x, WSR=0x%02x\n", nsr, wcr);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
spin_unlock_irqrestore(&db->lock, flags);
|
|
@@ -1313,7 +1312,7 @@ dm9000_open(struct net_device *dev)
|
|
|
|
|
|
mii_check_media(&db->mii, netif_msg_link(db), 1);
|
|
|
netif_start_queue(dev);
|
|
|
-
|
|
|
+
|
|
|
dm9000_schedule_poll(db);
|
|
|
|
|
|
return 0;
|
|
@@ -1627,7 +1626,7 @@ dm9000_probe(struct platform_device *pdev)
|
|
|
|
|
|
if (!is_valid_ether_addr(ndev->dev_addr)) {
|
|
|
/* try reading from mac */
|
|
|
-
|
|
|
+
|
|
|
mac_src = "chip";
|
|
|
for (i = 0; i < 6; i++)
|
|
|
ndev->dev_addr[i] = ior(db, i+DM9000_PAR);
|