Skip to content

Commit

Permalink
dl2k: the rest
Browse files Browse the repository at this point in the history
remove an unused union-with-bitfield of the same sort,
add missing conversions in debugging printk

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Al Viro authored and Jeff Garzik committed Jan 18, 2008
1 parent 5b51191 commit 0ca5f31
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
7 changes: 4 additions & 3 deletions drivers/net/dl2k.c
Original file line number Diff line number Diff line change
Expand Up @@ -1316,9 +1316,10 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
i,
(u32) (np->tx_ring_dma + i * sizeof (*desc)),
(u32) desc->next_desc,
(u32) desc->status, (u32) (desc->fraginfo >> 32),
(u32) desc->fraginfo);
(u32)le64_to_cpu(desc->next_desc),
(u32)le64_to_cpu(desc->status),
(u32)(le64_to_cpu(desc->fraginfo) >> 32),
(u32)le64_to_cpu(desc->fraginfo));
printk ("\n");
}
printk ("\n");
Expand Down
12 changes: 0 additions & 12 deletions drivers/net/dl2k.h
Original file line number Diff line number Diff line change
Expand Up @@ -364,18 +364,6 @@ enum _mii_anlpar {
};

/* Auto-Negotiation Expansion Register */
typedef union t_MII_ANER {
u16 image;
struct {
u16 lp_negotiable:1; // bit 0
u16 page_received:1; // bit 1
u16 nextpagable:1; // bit 2
u16 lp_nextpagable:1; // bit 3
u16 pdetect_fault:1; // bit 4
u16 _bit15_5:11; // bit 15:5
} bits;
} ANER_t, *PANER_t;

enum _mii_aner {
MII_ANER_PAR_DETECT_FAULT = 0x0010,
MII_ANER_LP_NEXTPAGABLE = 0x0008,
Expand Down

0 comments on commit 0ca5f31

Please sign in to comment.