Commit 2e713165f892c833d240cb265ab35490a7ef456f
Committed by
Linus Torvalds
Linus Torvalds
1 parent
d4c0deb700
Exists in
master
and in
4 other branches
ipwireless: Remove unused defines
ipwireless: Remove unused defines Remove unused defines, defines hiding variables, defines hiding 0. Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 7 additions and 11 deletions Side-by-side Diff
drivers/char/pcmcia/ipwireless/hardware.c
| ... | ... | @@ -227,15 +227,12 @@ |
| 227 | 227 | unsigned short memreg_tx_new; /* TX2 (new) Register (R/W) */ |
| 228 | 228 | }; |
| 229 | 229 | |
| 230 | -#define IODMADPR 0x00 /* DMA Data Port Register (R/W) */ | |
| 231 | - | |
| 232 | 230 | #define CARD_PRESENT_VALUE (0xBEEFCAFEUL) |
| 233 | 231 | |
| 234 | 232 | #define MEMTX_TX 0x0001 |
| 235 | 233 | #define MEMRX_RX 0x0001 |
| 236 | 234 | #define MEMRX_RX_DONE 0x0001 |
| 237 | 235 | #define MEMRX_PCINTACKK 0x0001 |
| 238 | -#define MEMRX_MEMSPURIOUSINT 0x0001 | |
| 239 | 236 | |
| 240 | 237 | #define NL_NUM_OF_PRIORITIES 3 |
| 241 | 238 | #define NL_NUM_OF_PROTOCOLS 3 |
| ... | ... | @@ -422,7 +419,7 @@ |
| 422 | 419 | |
| 423 | 420 | outw(DCR_TXDONE, hw->base_port + IODCR); |
| 424 | 421 | } else if (hw->hw_version == HW_VERSION_2) { |
| 425 | - outw((unsigned short) length, hw->base_port + IODMADPR); | |
| 422 | + outw((unsigned short) length, hw->base_port); | |
| 426 | 423 | |
| 427 | 424 | for (i = 0; i < length; i += 2) { |
| 428 | 425 | unsigned short d = data[i]; |
| 429 | 426 | |
| ... | ... | @@ -431,10 +428,10 @@ |
| 431 | 428 | if (i + 1 < length) |
| 432 | 429 | d |= data[i + 1] << 8; |
| 433 | 430 | raw_data = cpu_to_le16(d); |
| 434 | - outw(raw_data, hw->base_port + IODMADPR); | |
| 431 | + outw(raw_data, hw->base_port); | |
| 435 | 432 | } |
| 436 | 433 | while ((i & 3) != 2) { |
| 437 | - outw((unsigned short) 0xDEAD, hw->base_port + IODMADPR); | |
| 434 | + outw((unsigned short) 0xDEAD, hw->base_port); | |
| 438 | 435 | i += 2; |
| 439 | 436 | } |
| 440 | 437 | writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx); |
| ... | ... | @@ -863,7 +860,7 @@ |
| 863 | 860 | pkt[i + 1] = (unsigned char) (data >> 8); |
| 864 | 861 | } |
| 865 | 862 | } else { |
| 866 | - len = inw(hw->base_port + IODMADPR); | |
| 863 | + len = inw(hw->base_port); | |
| 867 | 864 | if (len > hw->ll_mtu) { |
| 868 | 865 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME |
| 869 | 866 | ": received a packet of %u bytes - " |
| ... | ... | @@ -874,7 +871,7 @@ |
| 874 | 871 | } |
| 875 | 872 | |
| 876 | 873 | for (i = 0; i < len; i += 2) { |
| 877 | - __le16 raw_data = inw(hw->base_port + IODMADPR); | |
| 874 | + __le16 raw_data = inw(hw->base_port); | |
| 878 | 875 | unsigned short data = le16_to_cpu(raw_data); |
| 879 | 876 | |
| 880 | 877 | pkt[i] = (unsigned char) data; |
| ... | ... | @@ -882,7 +879,7 @@ |
| 882 | 879 | } |
| 883 | 880 | |
| 884 | 881 | while ((i & 3) != 2) { |
| 885 | - inw(hw->base_port + IODMADPR); | |
| 882 | + inw(hw->base_port); | |
| 886 | 883 | i += 2; |
| 887 | 884 | } |
| 888 | 885 | } |
drivers/char/pcmcia/ipwireless/network.c
| ... | ... | @@ -29,7 +29,6 @@ |
| 29 | 29 | #include "main.h" |
| 30 | 30 | #include "tty.h" |
| 31 | 31 | |
| 32 | -#define MAX_OUTGOING_PACKETS_QUEUED ipwireless_out_queue | |
| 33 | 32 | #define MAX_ASSOCIATED_TTYS 2 |
| 34 | 33 | |
| 35 | 34 | #define SC_RCV_BITS (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP) |
| ... | ... | @@ -94,7 +93,7 @@ |
| 94 | 93 | unsigned long flags; |
| 95 | 94 | |
| 96 | 95 | spin_lock_irqsave(&network->spinlock, flags); |
| 97 | - if (network->outgoing_packets_queued < MAX_OUTGOING_PACKETS_QUEUED) { | |
| 96 | + if (network->outgoing_packets_queued < ipwireless_out_queue) { | |
| 98 | 97 | unsigned char *buf; |
| 99 | 98 | static unsigned char header[] = { |
| 100 | 99 | PPP_ALLSTATIONS, /* 0xff */ |