diff options
author | David Sterba <dsterba@suse.cz> | 2008-07-28 10:52:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:28:03 -0400 |
commit | 2e713165f892c833d240cb265ab35490a7ef456f (patch) | |
tree | 1f20f31e6a99a4efbe782e3ca53826755a244027 /drivers/char/pcmcia/ipwireless/hardware.c | |
parent | d4c0deb7009217d5cf7d0fe89255d64ecfad932b (diff) |
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>
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/hardware.c')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/hardware.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 6a3e666af019..ce57a7f92e8b 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c | |||
@@ -227,15 +227,12 @@ struct MEMINFREG { | |||
227 | unsigned short memreg_tx_new; /* TX2 (new) Register (R/W) */ | 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 | #define CARD_PRESENT_VALUE (0xBEEFCAFEUL) | 230 | #define CARD_PRESENT_VALUE (0xBEEFCAFEUL) |
233 | 231 | ||
234 | #define MEMTX_TX 0x0001 | 232 | #define MEMTX_TX 0x0001 |
235 | #define MEMRX_RX 0x0001 | 233 | #define MEMRX_RX 0x0001 |
236 | #define MEMRX_RX_DONE 0x0001 | 234 | #define MEMRX_RX_DONE 0x0001 |
237 | #define MEMRX_PCINTACKK 0x0001 | 235 | #define MEMRX_PCINTACKK 0x0001 |
238 | #define MEMRX_MEMSPURIOUSINT 0x0001 | ||
239 | 236 | ||
240 | #define NL_NUM_OF_PRIORITIES 3 | 237 | #define NL_NUM_OF_PRIORITIES 3 |
241 | #define NL_NUM_OF_PROTOCOLS 3 | 238 | #define NL_NUM_OF_PROTOCOLS 3 |
@@ -422,7 +419,7 @@ static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data, | |||
422 | 419 | ||
423 | outw(DCR_TXDONE, hw->base_port + IODCR); | 420 | outw(DCR_TXDONE, hw->base_port + IODCR); |
424 | } else if (hw->hw_version == HW_VERSION_2) { | 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 | for (i = 0; i < length; i += 2) { | 424 | for (i = 0; i < length; i += 2) { |
428 | unsigned short d = data[i]; | 425 | unsigned short d = data[i]; |
@@ -431,10 +428,10 @@ static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data, | |||
431 | if (i + 1 < length) | 428 | if (i + 1 < length) |
432 | d |= data[i + 1] << 8; | 429 | d |= data[i + 1] << 8; |
433 | raw_data = cpu_to_le16(d); | 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 | while ((i & 3) != 2) { | 433 | while ((i & 3) != 2) { |
437 | outw((unsigned short) 0xDEAD, hw->base_port + IODMADPR); | 434 | outw((unsigned short) 0xDEAD, hw->base_port); |
438 | i += 2; | 435 | i += 2; |
439 | } | 436 | } |
440 | writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx); | 437 | writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx); |
@@ -863,7 +860,7 @@ static void do_receive_packet(struct ipw_hardware *hw) | |||
863 | pkt[i + 1] = (unsigned char) (data >> 8); | 860 | pkt[i + 1] = (unsigned char) (data >> 8); |
864 | } | 861 | } |
865 | } else { | 862 | } else { |
866 | len = inw(hw->base_port + IODMADPR); | 863 | len = inw(hw->base_port); |
867 | if (len > hw->ll_mtu) { | 864 | if (len > hw->ll_mtu) { |
868 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME | 865 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME |
869 | ": received a packet of %u bytes - " | 866 | ": received a packet of %u bytes - " |
@@ -874,7 +871,7 @@ static void do_receive_packet(struct ipw_hardware *hw) | |||
874 | } | 871 | } |
875 | 872 | ||
876 | for (i = 0; i < len; i += 2) { | 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 | unsigned short data = le16_to_cpu(raw_data); | 875 | unsigned short data = le16_to_cpu(raw_data); |
879 | 876 | ||
880 | pkt[i] = (unsigned char) data; | 877 | pkt[i] = (unsigned char) data; |
@@ -882,7 +879,7 @@ static void do_receive_packet(struct ipw_hardware *hw) | |||
882 | } | 879 | } |
883 | 880 | ||
884 | while ((i & 3) != 2) { | 881 | while ((i & 3) != 2) { |
885 | inw(hw->base_port + IODMADPR); | 882 | inw(hw->base_port); |
886 | i += 2; | 883 | i += 2; |
887 | } | 884 | } |
888 | } | 885 | } |