asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tulip: remove wrapper around get_unaligned

Browse source 
DE_UNALIGNED_16 is always being passed a u16 *, no need to have the
wrapper with two casts in it, just call get_unaligned directly.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Harvey Harrison 2008-05-28 16:51:04 -07:00 committed by Jeff Garzik
parent f5ccbcfaca
commit 445854f4c4
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/tulip/de2104x.c
View file

@ -124,8 +124,6 @@ MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copi
/* Time in jiffies before concluding the transmitter is hung. */ /* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (6*HZ) #define TX_TIMEOUT (6*HZ)
#define DE_UNALIGNED_16(a) (u16)(get_unaligned((u16 *)(a)))
/* This is a mysterious value that can be written to CSR11 in the 21040 (only) /* This is a mysterious value that can be written to CSR11 in the 21040 (only)
to support a pre-NWay full-duplex signaling mechanism using short frames. to support a pre-NWay full-duplex signaling mechanism using short frames.
No one knows what it should be, but if left at its default value some No one knows what it should be, but if left at its default value some
@ -1811,7 +1809,7 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
goto bad_srom; goto bad_srom;
/* get default media type */ /* get default media type */
switch (DE_UNALIGNED_16(&il->default_media)) { switch (get_unaligned(&il->default_media)) {
case 0x0001: de->media_type = DE_MEDIA_BNC; break; case 0x0001: de->media_type = DE_MEDIA_BNC; break;
case 0x0002: de->media_type = DE_MEDIA_AUI; break; case 0x0002: de->media_type = DE_MEDIA_AUI; break;
case 0x0204: de->media_type = DE_MEDIA_TP_FD; break; case 0x0204: de->media_type = DE_MEDIA_TP_FD; break;
@ -1875,9 +1873,9 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
bufp += sizeof (ib->opts); bufp += sizeof (ib->opts);
if (ib->opts & MediaCustomCSRs) { if (ib->opts & MediaCustomCSRs) {
de->media[idx].csr13 = DE_UNALIGNED_16(&ib->csr13); de->media[idx].csr13 = get_unaligned(&ib->csr13);
de->media[idx].csr14 = DE_UNALIGNED_16(&ib->csr14); de->media[idx].csr14 = get_unaligned(&ib->csr14);
de->media[idx].csr15 = DE_UNALIGNED_16(&ib->csr15); de->media[idx].csr15 = get_unaligned(&ib->csr15);
bufp += sizeof(ib->csr13) + sizeof(ib->csr14) + bufp += sizeof(ib->csr13) + sizeof(ib->csr14) +
sizeof(ib->csr15); sizeof(ib->csr15);