diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-02-25 10:39:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 21:17:41 -0500 |
commit | 8a0939f500aac72e3bc47147c66c2575160a43ca (patch) | |
tree | 99c6e174f7dd1703cf3c13442663c49fe05317be | |
parent | 70dfb584a70adae99ae597a3deb418a8311a0998 (diff) |
staging: brcm80211: remove include file sbhndpio.h
All source files including sbhndpio.h were needing it only
because they needed d11.h and it had a dependency. The content
of sbhndpio.h has been merged in d11.h.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 files changed, 34 insertions, 68 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/d11.h b/drivers/staging/brcm80211/brcmsmac/d11.h index 80a8489b854..a9d182f4902 100644 --- a/drivers/staging/brcm80211/brcmsmac/d11.h +++ b/drivers/staging/brcm80211/brcmsmac/d11.h | |||
@@ -59,6 +59,37 @@ typedef volatile struct { | |||
59 | u32 intmask; | 59 | u32 intmask; |
60 | } intctrlregs_t; | 60 | } intctrlregs_t; |
61 | 61 | ||
62 | /* PIO structure, | ||
63 | * support two PIO format: 2 bytes access and 4 bytes access | ||
64 | * basic FIFO register set is per channel(transmit or receive) | ||
65 | * a pair of channels is defined for convenience | ||
66 | */ | ||
67 | /* 2byte-wide pio register set per channel(xmt or rcv) */ | ||
68 | typedef volatile struct { | ||
69 | u16 fifocontrol; | ||
70 | u16 fifodata; | ||
71 | u16 fifofree; /* only valid in xmt channel, not in rcv channel */ | ||
72 | u16 PAD; | ||
73 | } pio2regs_t; | ||
74 | |||
75 | /* a pair of pio channels(tx and rx) */ | ||
76 | typedef volatile struct { | ||
77 | pio2regs_t tx; | ||
78 | pio2regs_t rx; | ||
79 | } pio2regp_t; | ||
80 | |||
81 | /* 4byte-wide pio register set per channel(xmt or rcv) */ | ||
82 | typedef volatile struct { | ||
83 | u32 fifocontrol; | ||
84 | u32 fifodata; | ||
85 | } pio4regs_t; | ||
86 | |||
87 | /* a pair of pio channels(tx and rx) */ | ||
88 | typedef volatile struct { | ||
89 | pio4regs_t tx; | ||
90 | pio4regs_t rx; | ||
91 | } pio4regp_t; | ||
92 | |||
62 | /* read: 32-bit register that can be read as 32-bit or as 2 16-bit | 93 | /* read: 32-bit register that can be read as 32-bit or as 2 16-bit |
63 | * write: only low 16b-it half can be written | 94 | * write: only low 16b-it half can be written |
64 | */ | 95 | */ |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c index 2f80da7f0d0..151c9b26276 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <bcmnvram.h> | 26 | #include <bcmnvram.h> |
27 | #include <sbchipc.h> | 27 | #include <sbchipc.h> |
28 | #include <bcmdevs.h> | 28 | #include <bcmdevs.h> |
29 | #include <sbhndpio.h> | ||
30 | #include <sbhnddma.h> | 29 | #include <sbhnddma.h> |
31 | 30 | ||
32 | #include <wlc_phy_int.h> | 31 | #include <wlc_phy_int.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index f027d5076c7..36dea14b7d7 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <hndpmu.h> | 26 | #include <hndpmu.h> |
27 | 27 | ||
28 | #include <bcmdevs.h> | 28 | #include <bcmdevs.h> |
29 | #include <sbhndpio.h> | ||
30 | #include <sbhnddma.h> | 29 | #include <sbhnddma.h> |
31 | 30 | ||
32 | #include <wlc_phy_radio.h> | 31 | #include <wlc_phy_radio.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c index 23b6086aa74..af8291f1bc0 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <hndpmu.h> | 26 | #include <hndpmu.h> |
27 | 27 | ||
28 | #include <bcmdevs.h> | 28 | #include <bcmdevs.h> |
29 | #include <sbhndpio.h> | ||
30 | #include <sbhnddma.h> | 29 | #include <sbhnddma.h> |
31 | 30 | ||
32 | #include <wlc_phy_radio.h> | 31 | #include <wlc_phy_radio.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c index 330b88152b6..e962902d722 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <sbhndpio.h> | ||
19 | #include <sbhnddma.h> | 18 | #include <sbhnddma.h> |
20 | #include <osl.h> | 19 | #include <osl.h> |
21 | #include <wlc_phy_int.h> | 20 | #include <wlc_phy_int.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c index a9fc193721e..3dbce71f83a 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | 18 | ||
19 | #include <sbhndpio.h> | ||
20 | #include <sbhnddma.h> | 19 | #include <sbhnddma.h> |
21 | #include <osl.h> | 20 | #include <osl.h> |
22 | #include <wlc_phy_int.h> | 21 | #include <wlc_phy_int.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/sbhndpio.h b/drivers/staging/brcm80211/brcmsmac/sbhndpio.h deleted file mode 100644 index 9eabdb56da7..00000000000 --- a/drivers/staging/brcm80211/brcmsmac/sbhndpio.h +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2010 Broadcom Corporation | ||
3 | * | ||
4 | * Permission to use, copy, modify, and/or distribute this software for any | ||
5 | * purpose with or without fee is hereby granted, provided that the above | ||
6 | * copyright notice and this permission notice appear in all copies. | ||
7 | * | ||
8 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
9 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
10 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY | ||
11 | * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
12 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | ||
13 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | ||
14 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
15 | */ | ||
16 | |||
17 | #ifndef _sbhndpio_h_ | ||
18 | #define _sbhndpio_h_ | ||
19 | |||
20 | /* PIO structure, | ||
21 | * support two PIO format: 2 bytes access and 4 bytes access | ||
22 | * basic FIFO register set is per channel(transmit or receive) | ||
23 | * a pair of channels is defined for convenience | ||
24 | */ | ||
25 | |||
26 | /* 2byte-wide pio register set per channel(xmt or rcv) */ | ||
27 | typedef volatile struct { | ||
28 | u16 fifocontrol; | ||
29 | u16 fifodata; | ||
30 | u16 fifofree; /* only valid in xmt channel, not in rcv channel */ | ||
31 | u16 PAD; | ||
32 | } pio2regs_t; | ||
33 | |||
34 | /* a pair of pio channels(tx and rx) */ | ||
35 | typedef volatile struct { | ||
36 | pio2regs_t tx; | ||
37 | pio2regs_t rx; | ||
38 | } pio2regp_t; | ||
39 | |||
40 | /* 4byte-wide pio register set per channel(xmt or rcv) */ | ||
41 | typedef volatile struct { | ||
42 | u32 fifocontrol; | ||
43 | u32 fifodata; | ||
44 | } pio4regs_t; | ||
45 | |||
46 | /* a pair of pio channels(tx and rx) */ | ||
47 | typedef volatile struct { | ||
48 | pio4regs_t tx; | ||
49 | pio4regs_t rx; | ||
50 | } pio4regp_t; | ||
51 | |||
52 | #endif /* _sbhndpio_h_ */ | ||
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index b57c3a00461..137a382bac5 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | |||
@@ -35,11 +35,12 @@ | |||
35 | #include <wlioctl.h> | 35 | #include <wlioctl.h> |
36 | #include <sbhnddma.h> | 36 | #include <sbhnddma.h> |
37 | 37 | ||
38 | #include "phy/wlc_phy_int.h" | ||
39 | #include "d11.h" | ||
40 | #include "wlc_types.h" | ||
38 | #include "wlc_cfg.h" | 41 | #include "wlc_cfg.h" |
39 | #include "phy/phy_version.h" | 42 | #include "phy/phy_version.h" |
40 | #include "wlc_key.h" | 43 | #include "wlc_key.h" |
41 | #include "sbhndpio.h" | ||
42 | #include "phy/wlc_phy_hal.h" | ||
43 | #include "wlc_channel.h" | 44 | #include "wlc_channel.h" |
44 | #include "wlc_scb.h" | 45 | #include "wlc_scb.h" |
45 | #include "wlc_pub.h" | 46 | #include "wlc_pub.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index ff5516946ae..dc06b1ac11f 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <wlioctl.h> | 23 | #include <wlioctl.h> |
24 | #include <sbhnddma.h> | 24 | #include <sbhnddma.h> |
25 | 25 | ||
26 | #include "sbhndpio.h" | ||
27 | #include "d11.h" | 26 | #include "d11.h" |
28 | #include "wlc_types.h" | 27 | #include "wlc_types.h" |
29 | #include "wlc_cfg.h" | 28 | #include "wlc_cfg.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index ea6bb85d2c4..d438d9a2a3c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <bcmutils.h> | 21 | #include <bcmutils.h> |
22 | #include <siutils.h> | 22 | #include <siutils.h> |
23 | #include <wlioctl.h> | 23 | #include <wlioctl.h> |
24 | #include <sbhndpio.h> | ||
25 | #include <sbhnddma.h> | 24 | #include <sbhnddma.h> |
26 | #include <hnddma.h> | 25 | #include <hnddma.h> |
27 | #include <d11.h> | 26 | #include <d11.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index ec99420c9b9..3e453899db3 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <sbhnddma.h> | 30 | #include <sbhnddma.h> |
31 | #include <wlioctl.h> | 31 | #include <wlioctl.h> |
32 | 32 | ||
33 | #include "sbhndpio.h" | ||
34 | #include "d11.h" | 33 | #include "d11.h" |
35 | #include "wlc_rate.h" | 34 | #include "wlc_rate.h" |
36 | #include "wlc_key.h" | 35 | #include "wlc_key.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index b55ab25b1ed..4a7346f0f91 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <hndpmu.h> | 39 | #include <hndpmu.h> |
40 | 40 | ||
41 | #include "wlc_types.h" | 41 | #include "wlc_types.h" |
42 | #include "sbhndpio.h" | ||
43 | #include "d11.h" | 42 | #include "d11.h" |
44 | #include "wlc_cfg.h" | 43 | #include "wlc_cfg.h" |
45 | #include "wlc_rate.h" | 44 | #include "wlc_rate.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index c89ce5fede2..8e2a3848496 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <wlioctl.h> | 27 | #include <wlioctl.h> |
28 | 28 | ||
29 | #include "wlc_types.h" | 29 | #include "wlc_types.h" |
30 | #include "sbhndpio.h" | ||
31 | #include "d11.h" | 30 | #include "d11.h" |
32 | #include "wlc_cfg.h" | 31 | #include "wlc_cfg.h" |
33 | #include "wlc_scb.h" | 32 | #include "wlc_scb.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c index c7f0630f020..29d9dee38f8 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <hnddma.h> | 31 | #include <hnddma.h> |
32 | #include <hndpmu.h> | 32 | #include <hndpmu.h> |
33 | 33 | ||
34 | #include "sbhndpio.h" | ||
35 | #include "d11.h" | 34 | #include "d11.h" |
36 | #include "wlc_types.h" | 35 | #include "wlc_types.h" |
37 | #include "wlc_cfg.h" | 36 | #include "wlc_cfg.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 0b25bd767d5..fa3f73ffff1 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #include "wlc_types.h" | 42 | #include "wlc_types.h" |
43 | #include "wl_dbg.h" | 43 | #include "wl_dbg.h" |
44 | #include "sbhndpio.h" | ||
45 | #include "wlc_cfg.h" | 44 | #include "wlc_cfg.h" |
46 | #include "d11.h" | 45 | #include "d11.h" |
47 | #include "wlc_rate.h" | 46 | #include "wlc_rate.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index e22ff84ba67..863f18f86ec 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <sbhnddma.h> | 25 | #include <sbhnddma.h> |
26 | 26 | ||
27 | #include "wlc_types.h" | 27 | #include "wlc_types.h" |
28 | #include "sbhndpio.h" | ||
29 | #include "d11.h" | 28 | #include "d11.h" |
30 | #include "wl_dbg.h" | 29 | #include "wl_dbg.h" |
31 | #include "wlc_cfg.h" | 30 | #include "wlc_cfg.h" |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index 2d98f0d69a9..25fbcdac4f7 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <sbhnddma.h> | 28 | #include <sbhnddma.h> |
29 | 29 | ||
30 | #include "wlc_types.h" | 30 | #include "wlc_types.h" |
31 | #include "sbhndpio.h" | ||
32 | #include "d11.h" | 31 | #include "d11.h" |
33 | #include "wl_dbg.h" | 32 | #include "wl_dbg.h" |
34 | #include "wlc_cfg.h" | 33 | #include "wlc_cfg.h" |