From: "Arend van Spriel" <arend@broadcom.com>
To: gregkh@suse.de
Cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org,
"Roland Vossen" <rvossen@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 14/31] staging: brcm80211: replaced typedef tx_power_t by struct brcms_tx_power
Date: Wed, 6 Jul 2011 00:02:41 +0200 [thread overview]
Message-ID: <1309903378-29021-15-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1309903378-29021-1-git-send-email-arend@broadcom.com>
From: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 4 ++--
drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 2 +-
drivers/staging/brcm80211/brcmsmac/phy_shim.h | 2 +-
drivers/staging/brcm80211/brcmsmac/stf.c | 2 +-
drivers/staging/brcm80211/brcmsmac/types.h | 1 -
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index 43a1dc5..8850d6d 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -2179,7 +2179,7 @@ static u32 wlc_phy_txpower_est_power_nphy(struct brcms_phy *pi)
}
void
-wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, tx_power_t *power,
+wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, struct tx_power *power,
uint channel)
{
struct brcms_phy *pi = (struct brcms_phy *) ppi;
@@ -2187,7 +2187,7 @@ wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, tx_power_t *power,
u8 min_pwr, max_pwr;
#if WL_TX_POWER_RATES != TXP_NUM_RATES
-#error "tx_power_t struct out of sync with this fn"
+#error "struct tx_power out of sync with this fn"
#endif
if (ISNPHY(pi)) {
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
index a2df6b4..e327a57 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
@@ -270,7 +270,7 @@ extern void wlc_phy_mute_upd(struct brcms_phy_pub *ppi, bool val, mbool flags);
extern void wlc_phy_antsel_type_set(struct brcms_phy_pub *ppi, u8 antsel_type);
extern void wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi,
- tx_power_t *power, uint channel);
+ struct tx_power *power, uint channel);
extern void wlc_phy_initcal_enable(struct brcms_phy_pub *pih, bool initcal);
extern bool wlc_phy_test_ison(struct brcms_phy_pub *ppi);
diff --git a/drivers/staging/brcm80211/brcmsmac/phy_shim.h b/drivers/staging/brcm80211/brcmsmac/phy_shim.h
index a4550ed..0a29b67 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy_shim.h
+++ b/drivers/staging/brcm80211/brcmsmac/phy_shim.h
@@ -98,7 +98,7 @@
/* sslpnphy specifics */
#define WL_TX_POWER_MCS20_SISO_FIRST_SSN 12 /* Index for first 20MHz MCS SISO rate */
-/* tx_power_t.flags bits */
+/* struct tx_power::flags bits */
#define WL_TX_POWER_F_ENABLED 1
#define WL_TX_POWER_F_HW 2
#define WL_TX_POWER_F_MIMO 4
diff --git a/drivers/staging/brcm80211/brcmsmac/stf.c b/drivers/staging/brcm80211/brcmsmac/stf.c
index 3d5979b..b51ca7a 100644
--- a/drivers/staging/brcm80211/brcmsmac/stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/stf.c
@@ -97,7 +97,7 @@ void
brcms_c_stf_ss_algo_channel_get(struct brcms_c_info *wlc, u16 *ss_algo_channel,
chanspec_t chanspec)
{
- tx_power_t power;
+ struct tx_power power;
u8 siso_mcs_id, cdd_mcs_id, stbc_mcs_id;
/* Clear previous settings */
diff --git a/drivers/staging/brcm80211/brcmsmac/types.h b/drivers/staging/brcm80211/brcmsmac/types.h
index 9e9fe56..7ab4263 100644
--- a/drivers/staging/brcm80211/brcmsmac/types.h
+++ b/drivers/staging/brcm80211/brcmsmac/types.h
@@ -383,7 +383,6 @@ typedef volatile struct dma32diag dma32diag_t;
typedef volatile struct dma64regs dma64regs_t;
typedef struct brcms_rateset wlc_rateset_t;
typedef u32 ratespec_t;
-typedef struct tx_power tx_power_t;
typedef struct chanvec chanvec_t;
typedef s32 fixed;
typedef struct _cs32 cs32;
--
1.7.4.1
next prev parent reply other threads:[~2011-07-05 22:03 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 22:02 [PATCH 00/31] staging: brcm80211: fullmac cleanup and checkpatch fixes Arend van Spriel
2011-07-05 22:02 ` [PATCH 01/31] staging: brcm80211: clean up checkpatch error Arend van Spriel
2011-07-05 22:02 ` [PATCH 02/31] staging: brcm80211: removed occurrences of 'dhd' Arend van Spriel
2011-07-05 22:02 ` [PATCH 03/31] staging: brcm80211: removed unused #ifdef sections in fullmac Arend van Spriel
2011-07-05 22:02 ` [PATCH 04/31] staging: brcm80211: rename macros in dhd_dbg.h Arend van Spriel
2011-07-05 22:02 ` [PATCH 05/31] staging: brcm80211: removed asserts from two fullmac files Arend van Spriel
2011-07-05 22:02 ` [PATCH 06/31] staging: brcm80211: removed asserts from bcmsdh.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 07/31] staging: brcm80211: removed asserts from dhd_cdc.c and dhd_common.c Arend van Spriel
2011-07-06 9:24 ` Dan Carpenter
2011-07-06 14:27 ` Roland Vossen
2011-07-05 22:02 ` [PATCH 08/31] staging: brcm80211: removed asserts from dhd_linux.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 09/31] staging: brcm80211: removed asserts from dhd_sdio.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 10/31] staging: brcm80211: removed remains of assert mechanism in fullmac Arend van Spriel
2011-07-05 22:02 ` [PATCH 11/31] staging: brcm80211: replaced various typedefs in softmac Arend van Spriel
2011-07-05 22:02 ` [PATCH 12/31] staging: brcm80211: replaced typedef phy_info_t by struct brcms_phy Arend van Spriel
2011-07-05 22:02 ` [PATCH 13/31] staging: brcm80211: replaced typedef wlc_phy_t with struct brcms_phy_pub Arend van Spriel
2011-07-05 22:02 ` Arend van Spriel [this message]
2011-07-05 22:02 ` [PATCH 15/31] staging: brcm80211: renamed structures in softmac Arend van Spriel
2011-07-05 22:02 ` [PATCH 16/31] staging: brcm80211: remove checkpatch warnings 'suspect code indent' Arend van Spriel
2011-07-05 22:02 ` [PATCH 17/31] staging: brcm80211: made name lookup arrays more const Arend van Spriel
2011-07-05 22:02 ` [PATCH 18/31] staging: brcm80211: remove checkpatch warnings from phy_n.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 19/31] staging: brcm80211: replaced Broadcom specific acronym WLC Arend van Spriel
2011-07-05 22:02 ` [PATCH 20/31] staging: brcm80211: deleted two fullmac source files Arend van Spriel
2011-07-05 22:02 ` [PATCH 21/31] staging: brcm80211: merged dngl_stats.h into dhd.h Arend van Spriel
2011-07-05 22:02 ` [PATCH 22/31] staging: brcm80211: merged sbsdio.h into sdio_host.h Arend van Spriel
2011-07-05 22:02 ` [PATCH 23/31] staging: brcm80211: merged bcmsdbus.h " Arend van Spriel
2011-07-05 22:02 ` [PATCH 24/31] staging: brcm80211: moved fullmac definitions from .h to .c files Arend van Spriel
2011-07-05 22:02 ` [PATCH 25/31] staging: brcm80211: removed #ifdef SDIOH_API_ACCESS_RETRY_LIMIT Arend van Spriel
2011-07-05 22:02 ` [PATCH 26/31] staging: brcm80211: replace occurrences of __attribute__((packed)) Arend van Spriel
2011-07-05 22:02 ` [PATCH 27/31] staging: brcm80211: remove several externs from dhd_linux.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 28/31] staging: brcm80211: remove external definitions from phy_lcn.c Arend van Spriel
2011-07-05 22:02 ` [PATCH 29/31] staging: brcm80211: remove macro WLBANDINITFN from brcmsmac Arend van Spriel
2011-07-05 22:02 ` [PATCH 30/31] staging: brcm80211: simpler string handling in brcmf_c_pktfilter_offload_set() Arend van Spriel
2011-07-05 22:02 ` [PATCH 31/31] staging: brcm80211: added newlines to some debug macros in bcmsdh_sdmmc.c Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309903378-29021-15-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=linux-wireless@vger.kernel.org \
--cc=rvossen@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).