[PATCH] android/ion: fixing one coding style problem.
Added one line after variable declaration. Signed-off-by: Tan Nguyen --- drivers/staging/android/ion/ion.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 6f48112..e44f5e6 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1106,6 +1106,7 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client, struct ion_buffer *buffer; struct dma_buf *dmabuf; bool valid_handle; + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); mutex_lock(&client->lock); -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Need business leads?
Hope you are doing well! Our email marketing can generate tons of new customers for your business. We would like to be your marketing partners and help your business reach the new level. We can increase your business sales 2-4 times than now. Please contact us if you would require more information about pricing or proposal. Looking forward to your response. Thanks! Donald Email: andren...@sina.com pls send your address to dongfang...@tom.com for remove processing. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: rtl8188eu: don't define issue_asocrsp() in non-AP mode
If CONFIG_88EU_AP_MODE is undefined, issue_asocrsp() is never referenced.
Fixes warning:
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:891:13: warning:
‘issue_asocrsp’ defined but not used [-Wunused-function]
Signed-off-by: Luca Ceresoli
Fixes: 782eddd748d9 ("staging: rtl8188eu: unexport internal functions")
Cc: Greg Kroah-Hartman
Cc: Larry Finger
Cc: kbuild test robot
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index a68bc3cc3981..11cb0fac5da0 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -888,10 +888,10 @@ static void issue_auth(struct adapter *padapter, struct
sta_info *psta,
}
+#ifdef CONFIG_88EU_AP_MODE
static void issue_asocrsp(struct adapter *padapter, unsigned short status,
struct sta_info *pstat, int pkt_type)
{
-#ifdef CONFIG_88EU_AP_MODE
struct xmit_frame *pmgntframe;
struct rtw_ieee80211_hdr*pwlanhdr;
struct pkt_attrib *pattrib;
@@ -1011,8 +1011,8 @@ static void issue_asocrsp(struct adapter *padapter,
unsigned short status,
pattrib->last_txcmdsz = pattrib->pktlen;
dump_mgntframe(padapter, pmgntframe);
-#endif
}
+#endif /* CONFIG_88EU_AP_MODE */
static void issue_assocreq(struct adapter *padapter)
{
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: rtl8188eu: don't define OnAuth() in non-AP mode
If CONFIG_88EU_AP_MODE is undefined, OnAuth() is never referenced.
Fixes warning:
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2725:21: warning: ‘OnAuth’
defined but not used [-Wunused-function]
Signed-off-by: Luca Ceresoli
Fixes: 68345dd7bc26 ("staging: rtl8188eu: rtw_mlme_ext.c: unexport message
callbacks")
Cc: Greg Kroah-Hartman
Cc: Larry Finger
Cc: kbuild test robot
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 11cb0fac5da0..a0b8f665fa2f 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -2722,10 +2722,10 @@ _END_ONBEACON_:
return _SUCCESS;
}
+#ifdef CONFIG_88EU_AP_MODE
static unsigned int OnAuth(struct adapter *padapter,
struct recv_frame *precv_frame)
{
-#ifdef CONFIG_88EU_AP_MODE
unsigned intauth_mode, ie_len;
u16 seq;
unsigned char *sa, *p;
@@ -2888,9 +2888,9 @@ auth_fail:
issue_auth(padapter, pstat, (unsigned short)status);
-#endif /* CONFIG_88EU_AP_MODE */
return _FAIL;
}
+#endif /* CONFIG_88EU_AP_MODE */
static unsigned int OnAuthClient(struct adapter *padapter,
struct recv_frame *precv_frame)
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/7] Staging: rts5208: helper function to manage sd erase status
Use a helper function to manage SD erase status when SUPPORT_SD_LOCK is
defined
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 38 -
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index 0c1716e..e7d3280 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1143,11 +1143,30 @@ static void rtsx_monitor_aspm_config(struct rtsx_chip
*chip)
}
}
-void rtsx_polling_func(struct rtsx_chip *chip)
+static void rtsx_manage_sd_lock(struct rtsx_chip *chip)
{
#ifdef SUPPORT_SD_LOCK
struct sd_info *sd_card = &chip->sd_card;
+ u8 val;
+
+ if (!sd_card->sd_erase_status)
+ return;
+
+ if (chip->card_exist & SD_CARD) {
+ rtsx_read_register(chip, 0xFD30, &val);
+ if (val & 0x02) {
+ sd_card->sd_erase_status = SD_NOT_ERASE;
+ sd_card->sd_lock_notify = 1;
+ chip->need_reinit |= SD_CARD;
+ }
+ } else {
+ sd_card->sd_erase_status = SD_NOT_ERASE;
+ }
#endif
+}
+
+void rtsx_polling_func(struct rtsx_chip *chip)
+{
bool ss_allowed;
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
@@ -1180,22 +1199,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
}
#endif
-#ifdef SUPPORT_SD_LOCK
- if (sd_card->sd_erase_status) {
- if (chip->card_exist & SD_CARD) {
- u8 val;
-
- rtsx_read_register(chip, 0xFD30, &val);
- if (val & 0x02) {
- sd_card->sd_erase_status = SD_NOT_ERASE;
- sd_card->sd_lock_notify = 1;
- chip->need_reinit |= SD_CARD;
- }
- } else {
- sd_card->sd_erase_status = SD_NOT_ERASE;
- }
- }
-#endif
+ rtsx_manage_sd_lock(chip);
rtsx_init_cards(chip);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/7] Staging: rts5208: helper function to manage aspm
Use a helper function to manage aspm mode
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 51 ++---
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index 373ccd0..ee331f2 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1216,6 +1216,35 @@ static void rtsx_manage_ss(struct rtsx_chip *chip)
rtsx_exclusive_enter_ss(chip);
}
+static void rtsx_manage_aspm(struct rtsx_chip *chip)
+{
+ u8 data;
+
+ if (!CHECK_PID(chip, 0x5208))
+ return;
+
+ rtsx_monitor_aspm_config(chip);
+
+#ifdef SUPPORT_SDIO_ASPM
+ if (!CHK_SDIO_EXIST(chip) || CHK_SDIO_IGNORED(chip) ||
+ !chip->aspm_l0s_l1_en || !chip->dynamic_aspm)
+ return;
+
+ if (chip->sd_io) {
+ dynamic_configure_sdio_aspm(chip);
+ return;
+ }
+
+ if (chip->sdio_aspm)
+ return;
+
+ dev_dbg(rtsx_dev(chip), "SDIO enter ASPM!\n");
+ data = 0x30 | (chip->aspm_level[1] << 2);
+ rtsx_write_register(chip, ASPM_FORCE_CTL, 0xFC, data);
+ chip->sdio_aspm = 1;
+#endif
+}
+
void rtsx_polling_func(struct rtsx_chip *chip)
{
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
@@ -1241,27 +1270,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
rtsx_manage_ss(chip);
- if (CHECK_PID(chip, 0x5208)) {
- rtsx_monitor_aspm_config(chip);
-
-#ifdef SUPPORT_SDIO_ASPM
- if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip) &&
- chip->aspm_l0s_l1_en && chip->dynamic_aspm) {
- if (chip->sd_io) {
- dynamic_configure_sdio_aspm(chip);
- } else {
- if (!chip->sdio_aspm) {
- dev_dbg(rtsx_dev(chip), "SDIO enter
ASPM!\n");
- rtsx_write_register(chip,
- ASPM_FORCE_CTL, 0xFC,
- 0x30 |
- (chip->aspm_level[1] << 2));
- chip->sdio_aspm = 1;
- }
- }
- }
-#endif
- }
+ rtsx_manage_aspm(chip);
if (chip->idle_counter < IDLE_MAX_COUNT) {
chip->idle_counter++;
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/7] Staging: rts5208: helper function to manage ss
Use a helper function to manage ss_counter
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 66 ++---
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index 5946cc4..373ccd0 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1184,10 +1184,40 @@ static void rtsx_manage_sd_lock(struct rtsx_chip *chip)
#endif
}
-void rtsx_polling_func(struct rtsx_chip *chip)
+static bool rtsx_is_ss_allowed(struct rtsx_chip *chip)
+{
+ u32 val;
+
+ if (!chip->ss_en || CHECK_PID(chip, 0x5288))
+ return false;
+
+ if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
+ rtsx_read_cfg_dw(chip, 1, 0x04, &val);
+ if (val & 0x07)
+ return false;
+ }
+
+ return true;
+}
+
+static void rtsx_manage_ss(struct rtsx_chip *chip)
{
- bool ss_allowed;
+ if (!rtsx_is_ss_allowed(chip) || chip->sd_io)
+ return;
+
+ if (rtsx_get_stat(chip) != RTSX_STAT_IDLE) {
+ chip->ss_counter = 0;
+ return;
+ }
+ if (chip->ss_counter < (chip->ss_idle_period / POLLING_INTERVAL))
+ chip->ss_counter++;
+ else
+ rtsx_exclusive_enter_ss(chip);
+}
+
+void rtsx_polling_func(struct rtsx_chip *chip)
+{
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
return;
@@ -1209,37 +1239,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
rtsx_init_cards(chip);
- if (chip->ss_en) {
- ss_allowed = true;
-
- if (CHECK_PID(chip, 0x5288)) {
- ss_allowed = false;
- } else {
- if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
- u32 val;
-
- rtsx_read_cfg_dw(chip, 1, 0x04, &val);
- if (val & 0x07)
- ss_allowed = false;
- }
- }
- } else {
- ss_allowed = false;
- }
-
- if (ss_allowed && !chip->sd_io) {
- if (rtsx_get_stat(chip) != RTSX_STAT_IDLE) {
- chip->ss_counter = 0;
- } else {
- if (chip->ss_counter <
- (chip->ss_idle_period / POLLING_INTERVAL)) {
- chip->ss_counter++;
- } else {
- rtsx_exclusive_enter_ss(chip);
- return;
- }
- }
- }
+ rtsx_manage_ss(chip);
if (CHECK_PID(chip, 0x5208)) {
rtsx_monitor_aspm_config(chip);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/7] Staging: rts5208: helper function to manage power off
Use a helper function to check if power off is needed.
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 34 --
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index e7d3280..5946cc4 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1143,6 +1143,25 @@ static void rtsx_monitor_aspm_config(struct rtsx_chip
*chip)
}
}
+static void rtsx_manage_ocp(struct rtsx_chip *chip)
+{
+#ifdef SUPPORT_OCP
+ if (!chip->ocp_int)
+ return;
+
+ rtsx_read_register(chip, OCPSTAT, &chip->ocp_stat);
+
+ if (chip->card_exist & SD_CARD)
+ sd_power_off_card3v3(chip);
+ else if (chip->card_exist & MS_CARD)
+ ms_power_off_card3v3(chip);
+ else if (chip->card_exist & XD_CARD)
+ xd_power_off_card3v3(chip);
+
+ chip->ocp_int = 0;
+#endif
+}
+
static void rtsx_manage_sd_lock(struct rtsx_chip *chip)
{
#ifdef SUPPORT_SD_LOCK
@@ -1184,20 +1203,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
if (rtsx_chk_stat(chip, RTSX_STAT_SS))
return;
-#ifdef SUPPORT_OCP
- if (chip->ocp_int) {
- rtsx_read_register(chip, OCPSTAT, &chip->ocp_stat);
-
- if (chip->card_exist & SD_CARD)
- sd_power_off_card3v3(chip);
- else if (chip->card_exist & MS_CARD)
- ms_power_off_card3v3(chip);
- else if (chip->card_exist & XD_CARD)
- xd_power_off_card3v3(chip);
-
- chip->ocp_int = 0;
- }
-#endif
+ rtsx_manage_ocp(chip);
rtsx_manage_sd_lock(chip);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/7] Staging: rts5208: rtsx_polling_func function clean up
rtsx_polling_func is a big function that manage a lot of independent tasks. This patch aims to refactor the code using a series of helper functions, to make it more readable. Plus, the following checkpatch warning is corrected: * PARENTHESIS_ALIGNMENT at row 1246 Fabio Falzoi (7): Staging: rts5208: helper function to manage sd erase status Staging: rts5208: helper function to manage power off Staging: rts5208: helper function to manage ss Staging: rts5208: helper function to manage aspm Staging: rts5208: helper function to manage idle Staging: rts5208: helper function to manage 1lun and 2lun modes Staging: rts5208: helper function to manage delink states drivers/staging/rts5208/rtsx_chip.c | 452 +++- 1 file changed, 244 insertions(+), 208 deletions(-) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 5/7] Staging: rts5208: helper function to manage idle
Use a helper function to manage idle state
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 45 -
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index ee331f2..01b20fb 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1245,6 +1245,30 @@ static void rtsx_manage_aspm(struct rtsx_chip *chip)
#endif
}
+static void rtsx_manage_idle(struct rtsx_chip *chip)
+{
+ if (chip->idle_counter < IDLE_MAX_COUNT) {
+ chip->idle_counter++;
+ return;
+ }
+
+ if (rtsx_get_stat(chip) == RTSX_STAT_IDLE)
+ return;
+
+ dev_dbg(rtsx_dev(chip), "Idle state!\n");
+ rtsx_set_stat(chip, RTSX_STAT_IDLE);
+
+#if !defined(LED_AUTO_BLINK) && defined(REGULAR_BLINK)
+ chip->led_toggle_counter = 0;
+#endif
+ rtsx_force_power_on(chip, SSC_PDCTL);
+
+ turn_off_led(chip, LED_GPIO);
+
+ if (chip->auto_power_down && !chip->card_ready && !chip->sd_io)
+ rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
+}
+
void rtsx_polling_func(struct rtsx_chip *chip)
{
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
@@ -1272,26 +1296,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
rtsx_manage_aspm(chip);
- if (chip->idle_counter < IDLE_MAX_COUNT) {
- chip->idle_counter++;
- } else {
- if (rtsx_get_stat(chip) != RTSX_STAT_IDLE) {
- dev_dbg(rtsx_dev(chip), "Idle state!\n");
- rtsx_set_stat(chip, RTSX_STAT_IDLE);
-
-#if !defined(LED_AUTO_BLINK) && defined(REGULAR_BLINK)
- chip->led_toggle_counter = 0;
-#endif
- rtsx_force_power_on(chip, SSC_PDCTL);
-
- turn_off_led(chip, LED_GPIO);
-
- if (chip->auto_power_down && !chip->card_ready &&
- !chip->sd_io)
- rtsx_force_power_down(chip,
- SSC_PDCTL | OC_PDCTL);
- }
- }
+ rtsx_manage_idle(chip);
switch (rtsx_get_stat(chip)) {
case RTSX_STAT_RUN:
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 7/7] Staging: rts5208: helper function to manage delink states
Use a helper function to manage delink states
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 141 ++--
1 file changed, 72 insertions(+), 69 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index 298163a..d6fb6cd 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1318,6 +1318,77 @@ static void rtsx_manage_1lun_mode(struct rtsx_chip *chip)
#endif
}
+static void rtsx_delink_stage1(struct rtsx_chip *chip, int enter_L1,
+ int stage3_cnt)
+{
+ u8 val;
+
+ rtsx_set_stat(chip, RTSX_STAT_DELINK);
+
+ if (chip->asic_code && CHECK_PID(chip, 0x5208))
+ rtsx_set_phy_reg_bit(chip, 0x1C, 2);
+
+ if (chip->card_exist)
+ dev_dbg(rtsx_dev(chip), "False card inserted, do force
delink\n");
+ else
+ dev_dbg(rtsx_dev(chip), "No card inserted, do delink\n");
+
+ if (enter_L1)
+ rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 1);
+
+ if (chip->card_exist)
+ val = 0x03;
+ else
+ val = 0x0A;
+
+ rtsx_write_register(chip, CHANGE_LINK_STATE, val, val);
+
+ if (enter_L1)
+ rtsx_enter_L1(chip);
+
+ if (chip->card_exist)
+ chip->auto_delink_cnt = stage3_cnt + 1;
+}
+
+static void rtsx_delink_stage(struct rtsx_chip *chip)
+{
+ int delink_stage1_cnt, delink_stage2_cnt, delink_stage3_cnt;
+ int enter_L1;
+
+ if (!chip->auto_delink_en || !chip->auto_delink_allowed ||
+ chip->card_ready || chip->card_ejected || chip->sd_io) {
+ chip->auto_delink_cnt = 0;
+ return;
+ }
+
+ enter_L1 = chip->auto_delink_in_L1 &&
+ (chip->aspm_l0s_l1_en || chip->ss_en);
+
+ delink_stage1_cnt = chip->delink_stage1_step;
+ delink_stage2_cnt = delink_stage1_cnt + chip->delink_stage2_step;
+ delink_stage3_cnt = delink_stage2_cnt + chip->delink_stage3_step;
+
+ if (chip->auto_delink_cnt > delink_stage3_cnt)
+ return;
+
+ if (chip->auto_delink_cnt == delink_stage1_cnt)
+ rtsx_delink_stage1(chip, enter_L1, delink_stage3_cnt);
+
+ if (chip->auto_delink_cnt == delink_stage2_cnt) {
+ dev_dbg(rtsx_dev(chip), "Try to do force delink\n");
+
+ if (enter_L1)
+ rtsx_exit_L1(chip);
+
+ if (chip->asic_code && CHECK_PID(chip, 0x5208))
+ rtsx_set_phy_reg_bit(chip, 0x1C, 2);
+
+ rtsx_write_register(chip, CHANGE_LINK_STATE, 0x0A, 0x0A);
+ }
+
+ chip->auto_delink_cnt++;
+}
+
void rtsx_polling_func(struct rtsx_chip *chip)
{
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
@@ -1372,75 +1443,7 @@ void rtsx_polling_func(struct rtsx_chip *chip)
rtsx_manage_1lun_mode(chip);
delink_stage:
- if (chip->auto_delink_en && chip->auto_delink_allowed &&
- !chip->card_ready && !chip->card_ejected && !chip->sd_io) {
- int enter_L1 = chip->auto_delink_in_L1 && (
- chip->aspm_l0s_l1_en || chip->ss_en);
- int delink_stage1_cnt = chip->delink_stage1_step;
- int delink_stage2_cnt = delink_stage1_cnt +
- chip->delink_stage2_step;
- int delink_stage3_cnt = delink_stage2_cnt +
- chip->delink_stage3_step;
-
- if (chip->auto_delink_cnt <= delink_stage3_cnt) {
- if (chip->auto_delink_cnt == delink_stage1_cnt) {
- rtsx_set_stat(chip, RTSX_STAT_DELINK);
-
- if (chip->asic_code && CHECK_PID(chip, 0x5208))
- rtsx_set_phy_reg_bit(chip, 0x1C, 2);
-
- if (chip->card_exist) {
- dev_dbg(rtsx_dev(chip), "False card
inserted, do force delink\n");
-
- if (enter_L1)
- rtsx_write_register(chip,
- HOST_SLEEP_STATE,
- 0x03, 1);
-
- rtsx_write_register(chip,
- CHANGE_LINK_STATE,
- 0x0A, 0x0A);
-
- if (enter_L1)
- rtsx_enter_L1(chip);
-
- chip->auto_delink_cnt =
- delink_stage3_cnt + 1;
- } else {
- dev_dbg(rtsx_dev(chip), "No card
inserted, do delink\n");
-
-
[PATCH 6/7] Staging: rts5208: helper function to manage 1lun and 2lun modes
Use a helper function to manage lun modes when SUPPORT_OCP is defined
Signed-off-by: Fabio Falzoi
---
drivers/staging/rts5208/rtsx_chip.c | 97 -
1 file changed, 53 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/rts5208/rtsx_chip.c
b/drivers/staging/rts5208/rtsx_chip.c
index 01b20fb..298163a 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1269,6 +1269,55 @@ static void rtsx_manage_idle(struct rtsx_chip *chip)
rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
}
+static void rtsx_manage_2lun_mode(struct rtsx_chip *chip)
+{
+#ifdef SUPPORT_OCP
+ u8 sd_oc, ms_oc;
+
+ sd_oc = chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER);
+ ms_oc = chip->ocp_stat & (MS_OC_NOW | MS_OC_EVER);
+
+ if (sd_oc || ms_oc)
+ dev_dbg(rtsx_dev(chip), "Over current, OCPSTAT is 0x%x\n",
+ chip->ocp_stat);
+
+ if (sd_oc && (chip->card_exist & SD_CARD)) {
+ rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN, 0);
+ card_power_off(chip, SD_CARD);
+ chip->card_fail |= SD_CARD;
+ }
+
+ if (ms_oc && (chip->card_exist & MS_CARD)) {
+ rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
+ card_power_off(chip, MS_CARD);
+ chip->card_fail |= MS_CARD;
+ }
+#endif
+}
+
+static void rtsx_manage_1lun_mode(struct rtsx_chip *chip)
+{
+#ifdef SUPPORT_OCP
+ if (!(chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)))
+ return;
+
+ dev_dbg(rtsx_dev(chip), "Over current, OCPSTAT is 0x%x\n",
+ chip->ocp_stat);
+
+ if (chip->card_exist & SD_CARD) {
+ rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN, 0);
+ chip->card_fail |= SD_CARD;
+ } else if (chip->card_exist & MS_CARD) {
+ rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
+ chip->card_fail |= MS_CARD;
+ } else if (chip->card_exist & XD_CARD) {
+ rtsx_write_register(chip, CARD_OE, XD_OUTPUT_EN, 0);
+ chip->card_fail |= XD_CARD;
+ }
+ card_power_off(chip, SD_CARD);
+#endif
+}
+
void rtsx_polling_func(struct rtsx_chip *chip)
{
if (rtsx_chk_stat(chip, RTSX_STAT_SUSPEND))
@@ -1317,50 +1366,10 @@ void rtsx_polling_func(struct rtsx_chip *chip)
break;
}
-#ifdef SUPPORT_OCP
- if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
- if (chip->ocp_stat &
- (SD_OC_NOW | SD_OC_EVER | MS_OC_NOW | MS_OC_EVER))
- dev_dbg(rtsx_dev(chip), "Over current, OCPSTAT is
0x%x\n",
- chip->ocp_stat);
-
- if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
- if (chip->card_exist & SD_CARD) {
- rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN,
- 0);
- card_power_off(chip, SD_CARD);
- chip->card_fail |= SD_CARD;
- }
- }
- if (chip->ocp_stat & (MS_OC_NOW | MS_OC_EVER)) {
- if (chip->card_exist & MS_CARD) {
- rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN,
- 0);
- card_power_off(chip, MS_CARD);
- chip->card_fail |= MS_CARD;
- }
- }
- } else {
- if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
- dev_dbg(rtsx_dev(chip), "Over current, OCPSTAT is
0x%x\n",
- chip->ocp_stat);
- if (chip->card_exist & SD_CARD) {
- rtsx_write_register(chip, CARD_OE, SD_OUTPUT_EN,
- 0);
- chip->card_fail |= SD_CARD;
- } else if (chip->card_exist & MS_CARD) {
- rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN,
- 0);
- chip->card_fail |= MS_CARD;
- } else if (chip->card_exist & XD_CARD) {
- rtsx_write_register(chip, CARD_OE, XD_OUTPUT_EN,
- 0);
- chip->card_fail |= XD_CARD;
- }
- card_power_off(chip, SD_CARD);
- }
- }
-#endif
+ if (CHECK_LUN_MODE(chip, SD_MS_2LUN))
+ rtsx_manage_2lun_mode(chip);
+ else
+ rtsx_manage_1lun_mode(chip);
delink_stage:
if (chip->auto_delink_en && chip->auto_delink_allowed &&
--
2.1.4
_
Re: [PATCH] staging: comedi: replace ENOSYS by proper error codes
On 12/06/15 21:20, julien.de...@gmail.com wrote:
From: Julien Dehee
comedi/comedi_fops.c
use ENODEV following open manual
comedi/drivers.c
use ENOTTY following ioctl manual
drivers/serial2002.c
use ENOTTY following ioctl manual
Signed-off-by: Julien Dehee
---
drivers/staging/comedi/comedi_fops.c| 2 +-
drivers/staging/comedi/drivers.c| 2 +-
drivers/staging/comedi/drivers/serial2002.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/comedi_fops.c
b/drivers/staging/comedi/comedi_fops.c
index 146ab00..6896a1f 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2611,7 +2611,7 @@ static int comedi_open(struct inode *inode, struct file
*file)
}
if (dev->attached && dev->use_count == 0) {
if (!try_module_get(dev->driver->module)) {
- rc = -ENOSYS;
+ rc = -ENODEV;
goto out;
Seems reasonable as driver for the device is being unloaded.
}
if (dev->open) {
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index ed0b60c..db89096 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -820,7 +820,7 @@ int comedi_device_attach(struct comedi_device *dev, struct
comedi_devconfig *it)
"driver '%s' does not support attach using
comedi_config\n",
driv->driver_name);
module_put(driv->module);
- ret = -ENOSYS;
+ ret = -ENOTTY;
goto out;
I don't think ENOTTY is the correct error code here. the
COMEDI_DEVCONFIG ioctl code is an "appropriate" ioctl to send to a
comedi device. I'd suggest ENOTSUP as a replacement.
}
dev->driver = driv;
diff --git a/drivers/staging/comedi/drivers/serial2002.c
b/drivers/staging/comedi/drivers/serial2002.c
index 83da162..929bf20 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -101,7 +101,7 @@ static long serial2002_tty_ioctl(struct file *f, unsigned
op,
if (f->f_op->unlocked_ioctl)
return f->f_op->unlocked_ioctl(f, op, param);
- return -ENOSYS;
+ return -ENOTTY;
That is reasonable. It shouldn't happen anyway if 'f' really is linked
to a tty device. And the return value is currently ignored anyway!
}
static int serial2002_tty_write(struct file *f, unsigned char *buf, int count)
As Greg mentioned, it should be three different patches.
--
-=( Ian Abbott @ MEV Ltd.E-mail: )=-
-=( Web: http://www.mev.co.uk/ )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [BUG ?] staging: rtl8723au: condition with no effect
Nicholas Mc Guire writes:
> On Sat, 13 Jun 2015, Jes Sorensen wrote:
>
>> Nicholas Mc Guire writes:
>> > scanning for trivial bug-patters with coccinelle spatches returned:
>> > ./drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:1395
>> >WARNING: condition with no effect (if branch == else)
>> >
>> > drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c - line numbers
>> > from 4.1-rc7
>> > 1395if (bWithoutHWSM) {
>> > 1396/* value16 |= (APDM_HOST | FSM_HSUS |/PFM_ALDN); */
>> > 1397/* 2010/08/31 According to Filen description, we need to
>> > 1398use HW to shut down 8051 automatically. */
>> > 1399/* Because suspend operation need the asistance of 8051
>> > 1400to wait for 3ms. */
>> > 1401value16 = APDM_HOST | AFSM_HSUS | PFM_ALDN;
>> > 1402} else {
>> > 1403value16 = APDM_HOST | AFSM_HSUS | PFM_ALDN;
>> > 1404}
>> > 1405
>> > 1406rtl8723au_write16(padapter, REG_APS_FSMCO, value16);/* 0x4802
>> > */
>> >
>> > Not clear what the intent is but this looks like a typo/bug in the
>> > assigment
>> > of value16 as the condition here has no effect.
>>
>> Doesn't look like a typo, looks like someone at some point had commented
>> out PFM_ALDN in the bWithoutHWSM case. Why they did that and then later
>> overrode it, I have no idea.
>>
> as far as its traceable in git log if == else was in there from the
> very beginning (including that comment) - both the if and else were
> updated in commit cffca68d7b2f ("staging: rtl8723au: _DisableAnalog(): Avoid
> zero-init variables unnecessaril") but without changing PFM_ALDN - as there
> are no comments to the meaning of these bits in the header file there is
> no way to really come up with a resonable patch. anyway its either wrong
> settings or the condition should be removed.
There's a much longer history of this code going back to the vendor
origin - it shouldn't be removed unless we can get clarification from
them why that was.
Jes
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] android/ion: fixing one coding style problem.
On Sun, Jun 14, 2015 at 02:53:21PM +0700, Tan Nguyen wrote: > Added one line after variable declaration. > > Signed-off-by: Tan Nguyen > --- > drivers/staging/android/ion/ion.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/staging/android/ion/ion.c > b/drivers/staging/android/ion/ion.c > index 6f48112..e44f5e6 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -1106,6 +1106,7 @@ struct dma_buf *ion_share_dma_buf(struct ion_client > *client, > struct ion_buffer *buffer; > struct dma_buf *dmabuf; > bool valid_handle; > + > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); Nope, this is a variable definition, checkpatch needs to be fixed, this patch is not correct. sorry, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: sm750fb: Fix checkpatch.pl warnings
From: Niranjan Dighe
This patch removes spaces at the start of the line and replaces it
by tabs
Signed-off-by: Niranjan Dighe
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
b/drivers/staging/sm750fb/ddk750_dvi.h
index 50bcec2..cbd87c1 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -4,16 +4,18 @@
/* dvi chip stuffs structros */
typedef long (*PFN_DVICTRL_INIT)(
-unsigned char edgeSelect,
-unsigned char busSelect,
-unsigned char dualEdgeClkSelect,
-unsigned char hsyncEnable,
-unsigned char vsyncEnable,
-unsigned char deskewEnable,
-unsigned char deskewSetting,
-unsigned char continuousSyncEnable,
-unsigned char pllFilterEnable,
-unsigned char pllFilterValue);
+ unsigned char edgeSelect,
+ unsigned char busSelect,
+ unsigned char dualEdgeClkSelect,
+ unsigned char hsyncEnable,
+ unsigned char vsyncEnable,
+ unsigned char deskewEnable,
+ unsigned char deskewSetting,
+ unsigned char continuousSyncEnable,
+ unsigned char pllFilterEnable,
+ unsigned char pllFilterValue
+);
+
typedef void (*PFN_DVICTRL_RESETCHIP)(void);
typedef char* (*PFN_DVICTRL_GETCHIPSTRING)(void);
typedef unsigned short (*PFN_DVICTRL_GETVENDORID)(void);
@@ -24,44 +26,39 @@ typedef unsigned char (*PFN_DVICTRL_ISCONNECTED)(void);
typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void);
typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);
-
-
/* Structure to hold all the function pointer to the DVI Controller. */
typedef struct _dvi_ctrl_device_t
{
-PFN_DVICTRL_INITpfnInit;
-PFN_DVICTRL_RESETCHIP pfnResetChip;
-PFN_DVICTRL_GETCHIPSTRING pfnGetChipString;
-PFN_DVICTRL_GETVENDORID pfnGetVendorId;
-PFN_DVICTRL_GETDEVICEID pfnGetDeviceId;
-PFN_DVICTRL_SETPOWERpfnSetPower;
-PFN_DVICTRL_HOTPLUGDETECTIONpfnEnableHotPlugDetection;
-PFN_DVICTRL_ISCONNECTED pfnIsConnected;
-PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt;
-PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt;
+ PFN_DVICTRL_INITpfnInit;
+ PFN_DVICTRL_RESETCHIP pfnResetChip;
+ PFN_DVICTRL_GETCHIPSTRING pfnGetChipString;
+ PFN_DVICTRL_GETVENDORID pfnGetVendorId;
+ PFN_DVICTRL_GETDEVICEID pfnGetDeviceId;
+ PFN_DVICTRL_SETPOWERpfnSetPower;
+ PFN_DVICTRL_HOTPLUGDETECTIONpfnEnableHotPlugDetection;
+ PFN_DVICTRL_ISCONNECTED pfnIsConnected;
+ PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt;
+ PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt;
} dvi_ctrl_device_t;
-#define DVI_CTRL_SII164
-
+#define DVI_CTRL_SII164
/* dvi functions prototype */
int dviInit(
-unsigned char edgeSelect,
-unsigned char busSelect,
-unsigned char dualEdgeClkSelect,
-unsigned char hsyncEnable,
-unsigned char vsyncEnable,
-unsigned char deskewEnable,
-unsigned char deskewSetting,
-unsigned char continuousSyncEnable,
-unsigned char pllFilterEnable,
-unsigned char pllFilterValue
+ unsigned char edgeSelect,
+ unsigned char busSelect,
+ unsigned char dualEdgeClkSelect,
+ unsigned char hsyncEnable,
+ unsigned char vsyncEnable,
+ unsigned char deskewEnable,
+ unsigned char deskewSetting,
+ unsigned char continuousSyncEnable,
+ unsigned char pllFilterEnable,
+ unsigned char pllFilterValue
);
unsigned short dviGetVendorID(void);
unsigned short dviGetDeviceID(void);
-
-
#endif
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: sm750fb: fix checkpatch.pl indentation warnings
From: Niranjan Dighe
This patch fixes indentation issues by replacing spaces by tabs at
the start of line
Signed-off-by: Niranjan Dighe
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index b2bf7e6..c73b74a 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -1,4 +1,4 @@
-#define USE_DVICHIP
+#define USE_DVICHIP
#ifdef USE_DVICHIP
#include "ddk750_help.h"
#include "ddk750_reg.h"
@@ -12,44 +12,43 @@
static dvi_ctrl_device_t g_dcftSupportedDviController[] =
{
#ifdef DVI_CTRL_SII164
-{
-.pfnInit = sii164InitChip,
-.pfnGetVendorId = sii164GetVendorID,
-.pfnGetDeviceId = sii164GetDeviceID,
+ {
+ .pfnInit = sii164InitChip,
+ .pfnGetVendorId = sii164GetVendorID,
+ .pfnGetDeviceId = sii164GetDeviceID,
#ifdef SII164_FULL_FUNCTIONS
-.pfnResetChip = sii164ResetChip,
-.pfnGetChipString = sii164GetChipString,
-.pfnSetPower = sii164SetPower,
-.pfnEnableHotPlugDetection = sii164EnableHotPlugDetection,
-.pfnIsConnected = sii164IsConnected,
-.pfnCheckInterrupt = sii164CheckInterrupt,
-.pfnClearInterrupt = sii164ClearInterrupt,
+ .pfnResetChip = sii164ResetChip,
+ .pfnGetChipString = sii164GetChipString,
+ .pfnSetPower = sii164SetPower,
+ .pfnEnableHotPlugDetection = sii164EnableHotPlugDetection,
+ .pfnIsConnected = sii164IsConnected,
+ .pfnCheckInterrupt = sii164CheckInterrupt,
+ .pfnClearInterrupt = sii164ClearInterrupt,
#endif
-},
+ },
#endif
};
-
int dviInit(
-unsigned char edgeSelect,
-unsigned char busSelect,
-unsigned char dualEdgeClkSelect,
-unsigned char hsyncEnable,
-unsigned char vsyncEnable,
-unsigned char deskewEnable,
-unsigned char deskewSetting,
-unsigned char continuousSyncEnable,
-unsigned char pllFilterEnable,
-unsigned char pllFilterValue
- )
+ unsigned char edgeSelect,
+ unsigned char busSelect,
+ unsigned char dualEdgeClkSelect,
+ unsigned char hsyncEnable,
+ unsigned char vsyncEnable,
+ unsigned char deskewEnable,
+ unsigned char deskewSetting,
+ unsigned char continuousSyncEnable,
+ unsigned char pllFilterEnable,
+ unsigned char pllFilterValue
+)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
pCurrentDviCtrl = g_dcftSupportedDviController;
- if(pCurrentDviCtrl->pfnInit != NULL)
+ if (pCurrentDviCtrl->pfnInit != NULL)
{
return pCurrentDviCtrl->pfnInit(edgeSelect, busSelect,
dualEdgeClkSelect, hsyncEnable,
- vsyncEnable, deskewEnable, deskewSetting,
continuousSyncEnable,
- pllFilterEnable, pllFilterValue);
+ vsyncEnable, deskewEnable, deskewSetting,
continuousSyncEnable,
+ pllFilterEnable, pllFilterValue);
}
return -1; /* error */
}
@@ -64,13 +63,13 @@ int dviInit(
*/
unsigned short dviGetVendorID(void)
{
-dvi_ctrl_device_t *pCurrentDviCtrl;
+ dvi_ctrl_device_t *pCurrentDviCtrl;
-pCurrentDviCtrl = g_dcftSupportedDviController;
-if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
-return pCurrentDviCtrl->pfnGetVendorId();
+ pCurrentDviCtrl = g_dcftSupportedDviController;
+ if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
+ return pCurrentDviCtrl->pfnGetVendorId();
-return 0x;
+ return 0x;
}
@@ -83,15 +82,14 @@ unsigned short dviGetVendorID(void)
*/
unsigned short dviGetDeviceID(void)
{
-dvi_ctrl_device_t *pCurrentDviCtrl;
+ dvi_ctrl_device_t *pCurrentDviCtrl;
pCurrentDviCtrl = g_dcftSupportedDviController;
-if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
-return pCurrentDviCtrl->pfnGetDeviceId();
+ if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
+ return pCurrentDviCtrl->pfnGetDeviceId();
-return 0x;
+ return 0x;
}
#endif
-
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: sm750fb: fix checkpatch.pl indentation warnings
This patch fixes indentation issues by replacing spaces by tabs at the start of line Signed-off-by: Niranjan Dighe diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c index b2bf7e6..c73b74a 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.c +++ b/drivers/staging/sm750fb/ddk750_dvi.c - if(pCurrentDviCtrl->pfnInit != NULL) + if (pCurrentDviCtrl->pfnInit != NULL) You are fixing a different type of warning here. Please make only one kind of change per patch. Regards, Markus ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/2] staging: rtl8723au: include/rtl8723a_hal.h: fix firmware header struct
Apparently, there is some error in struct rt_8723a_firmware_hdr. Indeed, according to the comments in the code, the first 6 fields should be confined in the first 8 bytes, but they actually occupy 9 bytes. Moreover, the total size of the struct is 33 bytes, while function rtl8723a_FirmwareDownload() in hal/rtl8723a_hal_init.c assumes a 32-byte-long header. The "guilty" field is probably Rsvd1, which in similar drivers (e.g., rtl8723ae), has type u8, while in this case has type u16. Therefore, the first patch in this patchset assumes that the type of Rsvd is wrong and changes it to u8. The second patch also changes struct rt_8723a_firmware_hdr by making its other fields use the __leXX types in order to fix some sparse warnings. Daniele Alessandrelli (2): staging: rtl8723au: include/rtl8723a_hal.h: fix Rsvd1 size in fw header struct staging: rtl8723au: include/rtl8723a_hal.h: use __leXX types in fw header struct drivers/staging/rtl8723au/include/rtl8723a_hal.h | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- 1.8.3.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: rtl8723au: include/rtl8723a_hal.h: use __leXX types in fw header struct
This patch makes field in struct rt_8723a_firmware_hdr use endianness-aware
types (__leXX), thus fixing the following sparse warnings:
CHECK drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:263:37: warning: cast to
restricted __le16
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:265:39: warning: cast to
restricted __le16
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:277:13: warning: cast to
restricted __le16
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:277:13: warning: cast to
restricted __le16
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c:277:13: warning: cast to
restricted __le16
Signed-off-by: Daniele Alessandrelli
---
drivers/staging/rtl8723au/include/rtl8723a_hal.h | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index d40e420..743b52a 100644
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -80,10 +80,11 @@ struct rt_8723a_firmware_hdr {
/* 8-byte alinment required */
/* LONG WORD 0 */
- u16 Signature; /* 92C0: test chip; 92C, 88C0: test
chip; 88C1: MP A-cut; 92C1: MP A-cut */
+ __le16 Signature; /* 92C0: test chip; 92C, 88C0: test chip;
+* 88C1: MP A-cut; 92C1: MP A-cut */
u8 Category; /* AP/NIC and USB/PCI */
u8 Function; /* Reserved for different FW function
indcation, for further use when driver needs to download different FW in
different conditions */
- u16 Version;/* FW Version */
+ __le16 Version;/* FW Version */
u8 Subversion; /* FW Subversion, default 0x00 */
u8 Rsvd1;
@@ -93,16 +94,16 @@ struct rt_8723a_firmware_hdr {
u8 Date; /* Release time Date field */
u8 Hour; /* Release time Hour field */
u8 Minute; /* Release time Minute field */
- u16 RamCodeSize;/* The size of RAM code */
- u16 Rsvd2;
+ __le16 RamCodeSize;/* The size of RAM code */
+ __le16 Rsvd2;
/* LONG WORD 2 */
- u32 SvnIdx; /* The SVN entry index */
- u32 Rsvd3;
+ __le32 SvnIdx; /* The SVN entry index */
+ __le32 Rsvd3;
/* LONG WORD 3 */
- u32 Rsvd4;
- u32 Rsvd5;
+ __le32 Rsvd4;
+ __le32 Rsvd5;
};
#define DRIVER_EARLY_INT_TIME 0x05
--
1.8.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: rtl8723au: include/rtl8723a_hal.h: fix Rsvd1 size in fw header struct
The size of field Rsvd1 in struct rt_8723a_firmware_hdr should be u8
otherwise we exceeds the boundaries of "LONG WORD 0". This patch fixes
the issue.
Signed-off-by: Daniele Alessandrelli
---
drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index 8ee301b..d40e420 100644
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -85,7 +85,7 @@ struct rt_8723a_firmware_hdr {
u8 Function; /* Reserved for different FW function
indcation, for further use when driver needs to download different FW in
different conditions */
u16 Version;/* FW Version */
u8 Subversion; /* FW Subversion, default 0x00 */
- u16 Rsvd1;
+ u8 Rsvd1;
/* LONG WORD 1 */
--
1.8.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/16] staging: rtl8192e: Remove unused code
Another cleanup series. Most patches are pretty simple (fragmented a bit to make review easier). Series should apply cleanly into staging-next (5c1043984) and staging-testing (f996bd10). Target tested (802.11N/2.4G/WPA2 network, DHCP, 1MB download, ping). Mateusz Kulikowski (16): staging: rtl8192e: Remove unused code in rtl819x_HT.h staging: rtl8192e: Remove unused code in rtllib.h staging: rtl8192e: Remove rt_hi_throughput::ChnkOp staging: rtl8192e: Remove ENABLE_LOCK_DEBUG reference staging: rtl8192e: Remove rtllib_stop_queue() staging: rtl8192e: Remove rtllib_wake_queue() staging: rtl8192e: Remove dequeue_mgmt() and rtllib_resume_tx() staging: rtl8192e: Remove rtllib_is_shortslot() staging: rtl8192e: Remove rtllib_wx_get_encode_ext() staging: rtl8192e: Remove rtllib_device::get_nic_desc_num() staging: rtl8192e: Remove WIRELESS_EXT checks staging: rtl8192e: Remove rtllib_network::last_associate staging: rtl8192e: Remove rt_pwr_save_ctrl members staging: rtl8192e: Remove unused rtllib_device members staging: rtl8192e: Remove softmac_hint11d_wq queue staging: rtl8192e: Remove rtllib_device::agregation drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 23 -- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 1 - drivers/staging/rtl8192e/rtl819x_HT.h| 136 --- drivers/staging/rtl8192e/rtl819x_HTProc.c| 1 - drivers/staging/rtl8192e/rtllib.h| 520 --- drivers/staging/rtl8192e/rtllib_module.c | 3 - drivers/staging/rtl8192e/rtllib_rx.c | 54 ++- drivers/staging/rtl8192e/rtllib_softmac.c| 110 -- drivers/staging/rtl8192e/rtllib_wx.c | 57 --- 9 files changed, 24 insertions(+), 881 deletions(-) -- 1.8.4.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/16] staging: rtl8192e: Remove unused code in rtl819x_HT.h
Delete unused enums, structures and macros.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtl819x_HT.h | 128 --
1 file changed, 128 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h
b/drivers/staging/rtl8192e/rtl819x_HT.h
index f7076d7..0535810 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -19,45 +19,12 @@
#ifndef _RTL819XU_HTTYPE_H_
#define _RTL819XU_HTTYPE_H_
-
-#define HT_OPMODE_NO_PROTECT 0
-#define HT_OPMODE_OPTIONAL 1
-#define HT_OPMODE_40MHZ_PROTECT2
-#define HT_OPMODE_MIXED3
-
#define MIMO_PS_STATIC 0
#define MIMO_PS_DYNAMIC1
#define MIMO_PS_NOLIMIT3
-
-
#define sHTCLng4
-
-#define HT_SUPPORTED_MCS_1SS_BITMAP0x00ff
-#define HT_SUPPORTED_MCS_2SS_BITMAP0xff00
-#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP\
- (HT_MCS_1SS_BITMAP | HT_MCS_1SS_2SS_BITMAP)
-
-enum ht_mcs_rate {
- HT_MCS0 = 0x0001,
- HT_MCS1 = 0x0002,
- HT_MCS2 = 0x0004,
- HT_MCS3 = 0x0008,
- HT_MCS4 = 0x0010,
- HT_MCS5 = 0x0020,
- HT_MCS6 = 0x0040,
- HT_MCS7 = 0x0080,
- HT_MCS8 = 0x0100,
- HT_MCS9 = 0x0200,
- HT_MCS10 = 0x0400,
- HT_MCS11 = 0x0800,
- HT_MCS12 = 0x1000,
- HT_MCS13 = 0x2000,
- HT_MCS14 = 0x4000,
- HT_MCS15 = 0x8000,
-};
-
enum ht_channel_width {
HT_CHANNEL_WIDTH_20 = 0,
HT_CHANNEL_WIDTH_20_40 = 1,
@@ -77,27 +44,6 @@ enum chnl_op {
CHNLOP_SWCHNL = 3,
};
-enum ht_action {
- ACT_RECOMMAND_WIDTH = 0,
- ACT_MIMO_PWR_SAVE = 1,
- ACT_PSMP= 2,
- ACT_SET_PCO_PHASE = 3,
- ACT_MIMO_CHL_MEASURE= 4,
- ACT_RECIPROCITY_CORRECT = 5,
- ACT_MIMO_CSI_MATRICS= 6,
- ACT_MIMO_NOCOMPR_STEER = 7,
- ACT_MIMO_COMPR_STEER= 8,
- ACT_ANTENNA_SELECT = 9,
-};
-
-
-enum ht_bw40_sc {
- SC_MODE_DUPLICATE = 0,
- SC_MODE_LOWER = 1,
- SC_MODE_UPPER = 2,
- SC_MODE_FULL40MHZ = 3,
-};
-
struct ht_capab_ele {
u8 AdvCoding:1;
@@ -158,12 +104,6 @@ struct ht_info_ele {
u8 BasicMSC[16];
} __packed;
-struct mimops_ctrl {
- u8 MimoPsEnable:1;
- u8 MimoPsMode:1;
- u8 Reserved:6;
-};
-
enum ht_spec_ver {
HT_SPEC_VER_IEEE = 0,
HT_SPEC_VER_EWC = 1,
@@ -260,43 +200,6 @@ struct rt_hi_throughput {
u8 bAcceptAddbaReq;
} __packed;
-
-
-struct rt_htinfo_sta_entry {
- u8 bEnableHT;
-
- u8 bSupportCck;
-
- u16 AMSDU_MaxSize;
-
- u8 AMPDU_Factor;
- u8 MPDU_Density;
-
- u8 HTHighestOperaRate;
-
- u8 bBw40MHz;
-
- u8 bCurTxBW40MHz;
-
- u8 bCurShortGI20MHz;
-
- u8 bCurShortGI40MHz;
-
- u8 MimoPs;
-
- u8 McsRateSet[16];
-
- u8 bCurRxReorderEnable;
-
- u16 nAMSDU_MaxSize;
-
-};
-
-
-
-
-
-
struct bss_ht {
u8 bdSupportHT;
@@ -315,31 +218,6 @@ struct bss_ht {
u8 bdHT1R;
};
-struct mimo_rssi {
- u32 EnableAntenna;
- u32 AntennaA;
- u32 AntennaB;
- u32 AntennaC;
- u32 AntennaD;
- u32 Average;
-};
-
-struct mimo_evm {
- u32 EVM1;
- u32EVM2;
-};
-
-struct false_alarm_stats {
- u32 Cnt_Parity_Fail;
- u32 Cnt_Rate_Illegal;
- u32 Cnt_Crc8_fail;
- u32 Cnt_Mcs_fail;
- u32 Cnt_Ofdm_fail;
- u32 Cnt_Cck_fail;
- u32 Cnt_all;
-};
-
-
extern u8 MCS_FILTER_ALL[16];
extern u8 MCS_FILTER_1SS[16];
@@ -347,8 +225,6 @@ extern u8 MCS_FILTER_1SS[16];
#defineRATE_ADPT_2SS_MASK 0xF0
#defineRATE_ADPT_MCS32_MASK0x01
-#defineIS_11N_MCS_RATE(rate) (rate&0x80)
-
enum ht_aggre_size {
HT_AGG_SIZE_8K = 0,
HT_AGG_SIZE_16K = 1,
@@ -371,10 +247,6 @@ enum ht_iot_peer {
HT_IOT_PEER_MAX = 11,
};
-enum ht_iot_peer_subtype {
- HT_IOT_PEER_ATHEROS_DIR635 = 0,
-};
-
enum ht_iot_action {
HT_IOT_ACT_TX_USE_AMSDU_4K = 0x0001,
HT_IOT_ACT_TX_USE_AMSDU_8K = 0x0002,
--
1.8.4.1
___
devel mailing list
de
[PATCH 07/16] staging: rtl8192e: Remove dequeue_mgmt() and rtllib_resume_tx()
Both functions are never used.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib_softmac.c | 39 ---
1 file changed, 39 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index cb78782..a123772 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -147,21 +147,6 @@ static void enqueue_mgmt(struct rtllib_device *ieee,
struct sk_buff *skb)
}
-static struct sk_buff *dequeue_mgmt(struct rtllib_device *ieee)
-{
- struct sk_buff *ret;
-
- if (ieee->mgmt_queue_tail == ieee->mgmt_queue_head)
- return NULL;
-
- ret = ieee->mgmt_queue_ring[ieee->mgmt_queue_tail];
-
- ieee->mgmt_queue_tail =
- (ieee->mgmt_queue_tail+1) % MGMT_QUEUE_NUM;
-
- return ret;
-}
-
static void init_mgmt_queue(struct rtllib_device *ieee)
{
ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0;
@@ -2532,30 +2517,6 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct
rtllib_device *ieee)
}
-/* called with ieee->lock acquired */
-static void rtllib_resume_tx(struct rtllib_device *ieee)
-{
- int i;
-
- for (i = ieee->tx_pending.frag; i < ieee->tx_pending.txb->nr_frags;
-i++) {
-
- if (ieee->queue_stop) {
- ieee->tx_pending.frag = i;
- return;
- }
-
- ieee->softmac_data_hard_start_xmit(
- ieee->tx_pending.txb->fragments[i],
- ieee->dev, ieee->rate);
- ieee->stats.tx_packets++;
- }
-
- rtllib_txb_free(ieee->tx_pending.txb);
- ieee->tx_pending.txb = NULL;
-}
-
-
void rtllib_reset_queue(struct rtllib_device *ieee)
{
unsigned long flags;
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/16] staging: rtl8192e: Remove rt_hi_throughput::ChnkOp
Field was initialized and never used.
This patch also removes chnl_op enum that was only
referenced by ChnkOp init code.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtl819x_HT.h | 8
drivers/staging/rtl8192e/rtl819x_HTProc.c | 1 -
2 files changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h
b/drivers/staging/rtl8192e/rtl819x_HT.h
index 0535810..0c263d9 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -37,13 +37,6 @@ enum ht_extchnl_offset {
HT_EXTCHNL_OFFSET_LOWER = 3,
};
-enum chnl_op {
- CHNLOP_NONE = 0,
- CHNLOP_SCAN = 1,
- CHNLOP_SWBW = 2,
- CHNLOP_SWCHNL = 3,
-};
-
struct ht_capab_ele {
u8 AdvCoding:1;
@@ -173,7 +166,6 @@ struct rt_hi_throughput {
u8 PeerBandwidth;
u8 bSwBwInProgress;
- enum chnl_op ChnlOp;
u8 SwBwStep;
u8 bRegRT2RTAggregation;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c
b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index dcf8db1..b5c3647 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -676,7 +676,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
sizeof(pHTInfo->PeerHTInfoBuf));
pHTInfo->bSwBwInProgress = false;
- pHTInfo->ChnlOp = CHNLOP_NONE;
pHTInfo->ePeerHTSpecVer = HT_SPEC_VER_IEEE;
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 02/16] staging: rtl8192e: Remove unused code in rtllib.h
Delete macros, structure members and declarations etc. that are not
referenced anywhere in code.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 448 --
1 file changed, 448 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 5c3a979..f2f7efb 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -261,28 +261,6 @@ struct sw_chnl_cmd {
#defineMGN_MCS14_SG0x9e
#defineMGN_MCS15_SG0x9f
-enum hal_def_variable {
- HAL_DEF_TPC_ENABLE,
- HAL_DEF_INIT_GAIN,
- HAL_DEF_PROT_IMP_MODE,
- HAL_DEF_HIGH_POWER_MECHANISM,
- HAL_DEF_RATE_ADAPTIVE_MECHANISM,
- HAL_DEF_ANTENNA_DIVERSITY_MECHANISM,
- HAL_DEF_LED,
- HAL_DEF_CW_MAX_MIN,
-
- HAL_DEF_WOWLAN,
- HAL_DEF_ENDPOINTS,
- HAL_DEF_MIN_TX_POWER_DBM,
- HAL_DEF_MAX_TX_POWER_DBM,
- HW_DEF_EFUSE_REPG_SECTION1_FLAG,
- HW_DEF_EFUSE_REPG_DATA,
- HW_DEF_GPIO,
- HAL_DEF_PCI_SUPPORT_ASPM,
- HAL_DEF_THERMAL_VALUE,
- HAL_DEF_USB_IN_TOKEN_REV,
-};
-
enum hw_variables {
HW_VAR_ETHER_ADDR,
HW_VAR_MULTICAST_REG,
@@ -401,27 +379,14 @@ enum rt_op_mode {
#define IEEE_PARAM_AUTH_ALGS 5
#define IEEE_PARAM_IEEE_802_1X 6
#define IEEE_PARAM_WPAX_SELECT 7
-#define IEEE_PROTO_WPA 1
-#define IEEE_PROTO_RSN 2
-#define IEEE_WPAX_USEGROUP 0
-#define IEEE_WPAX_WEP401
-#define IEEE_WPAX_TKIP 2
-#define IEEE_WPAX_WRAP 3
-#define IEEE_WPAX_CCMP 4
-#define IEEE_WPAX_WEP104 5
-
-#define IEEE_KEY_MGMT_IEEE8021X1
-#define IEEE_KEY_MGMT_PSK 2
#define IEEE_MLME_STA_DEAUTH 1
#define IEEE_MLME_STA_DISASSOC 2
#define IEEE_CRYPT_ERR_UNKNOWN_ALG 2
-#define IEEE_CRYPT_ERR_UNKNOWN_ADDR3
#define IEEE_CRYPT_ERR_CRYPT_INIT_FAILED 4
#define IEEE_CRYPT_ERR_KEY_SET_FAILED 5
-#define IEEE_CRYPT_ERR_TX_KEY_SET_FAILED 6
#define IEEE_CRYPT_ERR_CARD_CONF_FAILED7
#defineIEEE_CRYPT_ALG_NAME_LEN 16
@@ -468,7 +433,6 @@ struct ieee_param {
#define msleep_interruptible_rsl msleep_interruptible
-#define RTLLIB_DATA_LEN2304
/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
* 6.2.1.1.2.
*
@@ -482,23 +446,13 @@ struct ieee_param {
#define RTLLIB_3ADDR_LEN 24
#define RTLLIB_4ADDR_LEN 30
#define RTLLIB_FCS_LEN4
-#define RTLLIB_HLEN (RTLLIB_4ADDR_LEN)
-#define RTLLIB_FRAME_LEN(RTLLIB_DATA_LEN + RTLLIB_HLEN)
-#define RTLLIB_MGMT_HDR_LEN 24
-#define RTLLIB_DATA_HDR3_LEN 24
-#define RTLLIB_DATA_HDR4_LEN 30
#define RTLLIB_SKBBUFFER_SIZE 2500
#define MIN_FRAG_THRESHOLD 256U
#define MAX_FRAG_THRESHOLD 2346U
-#define MAX_HT_DATA_FRAG_THRESHOLD 0x2000
-
-#define HT_AMSDU_SIZE_4K 3839
-#define HT_AMSDU_SIZE_8K 7935
/* Frame control field constants */
-#define RTLLIB_FCTL_VERS 0x0003
#define RTLLIB_FCTL_FTYPE 0x000c
#define RTLLIB_FCTL_STYPE 0x00f0
#define RTLLIB_FCTL_FRAMETYPE 0x00fc
@@ -535,9 +489,6 @@ struct ieee_param {
#define RTLLIB_STYPE_RTS 0x00B0
#define RTLLIB_STYPE_CTS 0x00C0
#define RTLLIB_STYPE_ACK 0x00D0
-#define RTLLIB_STYPE_CFEND 0x00E0
-#define RTLLIB_STYPE_CFENDACK 0x00F0
-#define RTLLIB_STYPE_BLOCKACK 0x0094
/* data */
#define RTLLIB_STYPE_DATA 0x
@@ -545,9 +496,6 @@ struct ieee_param {
#define RTLLIB_STYPE_DATA_CFPOLL 0x0020
#define RTLLIB_STYPE_DATA_CFACKPOLL0x0030
#define RTLLIB_STYPE_NULLFUNC 0x0040
-#define RTLLIB_STYPE_CFACK 0x0050
-#define RTLLIB_STYPE_CFPOLL0x0060
-#define RTLLIB_STYPE_CFACKPOLL 0x0070
#define RTLLIB_STYPE_QOS_DATA 0x0080
#define RTLLIB_STYPE_QOS_NULL 0x00C0
@@ -576,13 +524,6 @@ enum act_category {
ACT_CAT_WMM = 17,
};
-enum ts_action {
- ACT_ADDTSREQ = 0,
- ACT_ADDTSRSP = 1,
- ACT_DELTS= 2,
- ACT_SCHEDULE = 3,
-};
-
enum ba_action {
ACT_ADDBAREQ = 0,
ACT_ADDBARSP = 1,
@@ -604,20 +545,11 @@ enum led_ctl_mode {
LED_CTL_SITE_SURVEY = 6,
LED_CTL_POWER_OFF = 7,
LED_CTL_START_TO_LINK = 8,
- LED_CTL_START_WPS = 9,
- LED_CTL_STOP_WPS = 10,
- LED_CTL_START_WPS_BOTTON = 11,
- LED_CTL_STOP_WPS_FAIL = 12,
-LED_CTL_STOP_WPS_FAIL_OVERLAP = 13,
};
enum rt_rf_type_def {
RF_1T2R = 0,
RF_2T4R,
- RF_2T2R,
- RF_1T1R,
- RF_2T2R_GREEN,
- RF_819X_MAX_TYPE
};
enum wireless_mode {
@@
[PATCH 08/16] staging: rtl8192e: Remove rtllib_is_shortslot()
This function was declared but never unused.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_softmac.c | 5 -
2 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index b4eb24e..4b6ccb8 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2170,7 +2170,6 @@ extern int rtllib_wx_set_gen_ie(struct rtllib_device
*ieee, u8 *ie, size_t len);
/* rtllib_softmac.c */
extern short rtllib_is_54g(struct rtllib_network *net);
-extern short rtllib_is_shortslot(const struct rtllib_network *net);
extern int rtllib_rx_frame_softmac(struct rtllib_device *ieee,
struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, u16 type,
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index a123772..dc3fc12 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -28,11 +28,6 @@ short rtllib_is_54g(struct rtllib_network *net)
return (net->rates_ex_len > 0) || (net->rates_len > 4);
}
-short rtllib_is_shortslot(const struct rtllib_network *net)
-{
- return net->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME;
-}
-
/* returns the total length needed for placing the RATE MFIE
* tag and the EXTENDED RATE MFIE tag if needed.
* It encludes two bytes per tag for the tag itself and its len
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/16] staging: rtl8192e: Remove rtllib_stop_queue()
This function was declared but never unused.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_softmac.c | 12
2 files changed, 13 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 5d93f24..2931733 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2220,7 +2220,6 @@ extern void rtllib_softmac_start_protocol(struct
rtllib_device *ieee,
extern void rtllib_reset_queue(struct rtllib_device *ieee);
extern void rtllib_wake_queue(struct rtllib_device *ieee);
-extern void rtllib_stop_queue(struct rtllib_device *ieee);
extern void rtllib_wake_all_queues(struct rtllib_device *ieee);
extern void rtllib_stop_all_queues(struct rtllib_device *ieee);
extern struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 7ce58e2..95e739e 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2613,18 +2613,6 @@ exit:
spin_unlock_irqrestore(&ieee->lock, flags);
}
-
-void rtllib_stop_queue(struct rtllib_device *ieee)
-{
-
- if (!netif_queue_stopped(ieee->dev)) {
- netif_stop_queue(ieee->dev);
- ieee->softmac_stats.swtxstop++;
- }
- ieee->queue_stop = 1;
-
-}
-
void rtllib_stop_all_queues(struct rtllib_device *ieee)
{
unsigned int i;
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/16] staging: rtl8192e: Remove rtllib_wx_get_encode_ext()
This function was declared but never unused.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h| 3 --
drivers/staging/rtl8192e/rtllib_wx.c | 57
2 files changed, 60 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 4b6ccb8..6d6e637 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2153,9 +2153,6 @@ extern int rtllib_wx_get_encode(struct rtllib_device
*ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *key);
#if WIRELESS_EXT >= 18
-extern int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra);
extern int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c
b/drivers/staging/rtl8192e/rtllib_wx.c
index f31d864..967ba8b 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -682,63 +682,6 @@ done:
}
EXPORT_SYMBOL(rtllib_wx_set_encode_ext);
-int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
- struct iw_point *encoding = &wrqu->encoding;
- struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
- struct lib80211_crypt_data *crypt;
- int idx, max_key_len;
-
- max_key_len = encoding->length - sizeof(*ext);
- if (max_key_len < 0)
- return -EINVAL;
-
- idx = encoding->flags & IW_ENCODE_INDEX;
- if (idx) {
- if (idx < 1 || idx > NUM_WEP_KEYS)
- return -EINVAL;
- idx--;
- } else {
- idx = ieee->crypt_info.tx_keyidx;
- }
- if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
- (ext->alg != IW_ENCODE_ALG_WEP))
- if (idx != 0 || (ieee->iw_mode != IW_MODE_INFRA))
- return -EINVAL;
-
- crypt = ieee->crypt_info.crypt[idx];
-
- encoding->flags = idx + 1;
- memset(ext, 0, sizeof(*ext));
-
- if (crypt == NULL || crypt->ops == NULL) {
- ext->alg = IW_ENCODE_ALG_NONE;
- ext->key_len = 0;
- encoding->flags |= IW_ENCODE_DISABLED;
- } else {
- if (strcmp(crypt->ops->name, "R-WEP") == 0)
- ext->alg = IW_ENCODE_ALG_WEP;
- else if (strcmp(crypt->ops->name, "R-TKIP"))
- ext->alg = IW_ENCODE_ALG_TKIP;
- else if (strcmp(crypt->ops->name, "R-CCMP"))
- ext->alg = IW_ENCODE_ALG_CCMP;
- else
- return -EINVAL;
- ext->key_len = crypt->ops->get_key(ext->key, SCM_KEY_LEN,
- NULL, crypt->priv);
- encoding->flags |= IW_ENCODE_ENABLED;
- if (ext->key_len &&
- (ext->alg == IW_ENCODE_ALG_TKIP ||
-ext->alg == IW_ENCODE_ALG_CCMP))
- ext->ext_flags |= IW_ENCODE_EXT_TX_SEQ_VALID;
-
- }
-
- return 0;
-}
-
int rtllib_wx_set_mlme(struct rtllib_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 04/16] staging: rtl8192e: Remove ENABLE_LOCK_DEBUG reference
ENABLE_LOCK_DEBUG macro was never set, so condition that used it can be resolved manually. Signed-off-by: Mateusz Kulikowski --- drivers/staging/rtl8192e/rtllib.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index f2f7efb..5d93f24 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2404,9 +2404,7 @@ extern void HTUseDefaultSetting(struct rtllib_device *ieee); #define RT_ASOC_RETRY_LIMIT5 u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee); extern void rtllib_TURBO_Info(struct rtllib_device *ieee, u8 **tag_p); -#ifndef ENABLE_LOCK_DEBUG #define SEM_DOWN_IEEE_WX(psem) down(psem) #define SEM_UP_IEEE_WX(psem) up(psem) -#endif #endif /* RTLLIB_H */ -- 1.8.4.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 13/16] staging: rtl8192e: Remove rt_pwr_save_ctrl members
Following members were removed:
- tmpJoinAction
- tmpSuppRateBuf
- bTmpIbpm
As a consequence several unused defines/enums/structs were
also removed from rtllib.h
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 36
1 file changed, 36 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 3895694..49f31ec 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1368,42 +1368,12 @@ enum ips_callback_function {
IPS_CALLBACK_JOIN_REQUEST = 2,
};
-enum rt_join_action {
- RT_JOIN_INFRA = 1,
- RT_JOIN_IBSS = 2,
- RT_START_IBSS = 3,
- RT_NO_ACTION = 4,
-};
-
-struct ibss_parms {
- u16 atimWin;
-};
-#define MAX_NUM_RATES 264
-
enum rt_rf_power_state {
eRfOn,
eRfSleep,
eRfOff
};
-#defineMAX_SUPPORT_WOL_PATTERN_NUM 8
-
-enum wol_pattern_type {
- eNetBIOS = 0,
- eIPv4IPv6ARP,
- eIPv4IPv6TCPSYN,
- eMACIDOnly,
- eNoDefined,
-};
-
-struct rt_pm_wol_info {
- u32 PatternId;
- u32 Mask[4];
- u16 CrcRemainder;
- u8 WFMIndex;
- enum wol_pattern_type PatternType;
-};
-
struct rt_pwr_save_ctrl {
boolbInactivePs;
@@ -1412,10 +1382,6 @@ struct rt_pwr_save_ctrl {
enum rt_rf_power_state eInactivePowerState;
enum ips_callback_function ReturnPoint;
- enum rt_join_action tmpJoinAction;
- u8 tmpSuppRateBuf[MAX_NUM_RATES];
- boolbTmpIbpm;
-
boolbLeisurePs;
u8 LpsIdleCount;
u8 RegMaxLPSAwakeIntvl;
@@ -1426,8 +1392,6 @@ struct rt_pwr_save_ctrl {
boolbFwCtrlLPS;
- struct rt_pm_wol_info PmWoLPatternInfo[MAX_SUPPORT_WOL_PATTERN_NUM];
-
};
#define RT_RF_CHANGE_SOURCE u32
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/16] staging: rtl8192e: Remove rtllib_device::get_nic_desc_num()
This function/callback was initialized and never called.
rtl8192_get_nic_desc_num() function that was default
implementation was also removed.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 17 -
drivers/staging/rtl8192e/rtllib.h| 1 -
2 files changed, 18 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 4c53c87..71289ca 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -440,22 +440,6 @@ bool MgntActSet_RF_State(struct net_device *dev,
return bActionAllowed;
}
-
-static short rtl8192_get_nic_desc_num(struct net_device *dev, int prio)
-{
- struct r8192_priv *priv = rtllib_priv(dev);
- struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
-
- /* For now, we reserved two free descriptor as a safety boundary
- * between the tail and the head
- */
- if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10))
- RT_TRACE(COMP_DBG,
-"-[%d]-ring->idx=%d
queue_len=%d-\n",
-prio, ring->idx, skb_queue_len(&ring->queue));
- return skb_queue_len(&ring->queue);
-}
-
static short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -1046,7 +1030,6 @@ static void rtl8192_init_priv_handler(struct net_device
*dev)
priv->rtllib->data_hard_stop= rtl8192_data_hard_stop;
priv->rtllib->data_hard_resume = rtl8192_data_hard_resume;
priv->rtllib->check_nic_enough_desc = rtl8192_check_nic_enough_desc;
- priv->rtllib->get_nic_desc_num = rtl8192_get_nic_desc_num;
priv->rtllib->handle_assoc_response = rtl8192_handle_assoc_response;
priv->rtllib->handle_beacon = rtl8192_handle_beacon;
priv->rtllib->SetWirelessMode = rtl8192_SetWirelessMode;
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 6d6e637..22cbd45 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1952,7 +1952,6 @@ struct rtllib_device {
/* check whether Tx hw resource available */
short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
- short (*get_nic_desc_num)(struct net_device *dev, int queue_index);
void (*SetBWModeHandler)(struct net_device *dev,
enum ht_channel_width Bandwidth,
enum ht_extchnl_offset Offset);
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 12/16] staging: rtl8192e: Remove rtllib_network::last_associate
Variable was initialized and never used.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h| 1 -
drivers/staging/rtl8192e/rtllib_rx.c | 2 --
2 files changed, 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index f785e84..3895694 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1246,7 +1246,6 @@ struct rtllib_network {
unsigned long last_scanned;
u8 mode;
u32 flags;
- u32 last_associate;
u32 time_stamp[2];
u16 beacon_interval;
u16 listen_interval;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c
b/drivers/staging/rtl8192e/rtllib_rx.c
index 2bef1f6..48a188a 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -2326,7 +2326,6 @@ static inline int rtllib_network_init(
/* Where to pull this? beacon->listen_interval;*/
network->listen_interval = 0x0A;
network->rates_len = network->rates_ex_len = 0;
- network->last_associate = 0;
network->ssid_len = 0;
network->hidden_ssid_len = 0;
memset(network->hidden_ssid, 0, sizeof(network->hidden_ssid));
@@ -2504,7 +2503,6 @@ static inline void update_network(struct rtllib_device
*ieee,
dst->qos_data.active = qos_active;
dst->qos_data.old_param_count = old_param;
- /* dst->last_associate is not overwritten */
dst->wmm_info = src->wmm_info;
if (src->wmm_param[0].ac_aci_acm_aifsn ||
src->wmm_param[1].ac_aci_acm_aifsn ||
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue()
This function was declared but never unused.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_softmac.c | 41 ---
2 files changed, 42 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 2931733..b4eb24e 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2219,7 +2219,6 @@ extern void rtllib_softmac_start_protocol(struct
rtllib_device *ieee,
u8 mesh_flag);
extern void rtllib_reset_queue(struct rtllib_device *ieee);
-extern void rtllib_wake_queue(struct rtllib_device *ieee);
extern void rtllib_wake_all_queues(struct rtllib_device *ieee);
extern void rtllib_stop_all_queues(struct rtllib_device *ieee);
extern struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 95e739e..cb78782 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2572,47 +2572,6 @@ void rtllib_reset_queue(struct rtllib_device *ieee)
}
EXPORT_SYMBOL(rtllib_reset_queue);
-void rtllib_wake_queue(struct rtllib_device *ieee)
-{
-
- unsigned long flags;
- struct sk_buff *skb;
- struct rtllib_hdr_3addr *header;
-
- spin_lock_irqsave(&ieee->lock, flags);
- if (!ieee->queue_stop)
- goto exit;
-
- ieee->queue_stop = 0;
-
- if (ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE) {
- while (!ieee->queue_stop && (skb = dequeue_mgmt(ieee))) {
-
- header = (struct rtllib_hdr_3addr *) skb->data;
-
- header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
-
- if (ieee->seq_ctrl[0] == 0xFFF)
- ieee->seq_ctrl[0] = 0;
- else
- ieee->seq_ctrl[0]++;
-
- ieee->softmac_data_hard_start_xmit(skb, ieee->dev,
- ieee->basic_rate);
- }
- }
- if (!ieee->queue_stop && ieee->tx_pending.txb)
- rtllib_resume_tx(ieee);
-
- if (!ieee->queue_stop && netif_queue_stopped(ieee->dev)) {
- ieee->softmac_stats.swtxawake++;
- netif_wake_queue(ieee->dev);
- }
-
-exit:
- spin_unlock_irqrestore(&ieee->lock, flags);
-}
-
void rtllib_stop_all_queues(struct rtllib_device *ieee)
{
unsigned int i;
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 15/16] staging: rtl8192e: Remove softmac_hint11d_wq queue
This queue is never used, and function handler is empty
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_softmac.c | 6 --
2 files changed, 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index f3a4bbc..74c2a28 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1794,7 +1794,6 @@ struct rtllib_device {
struct work_struct ips_leave_wq;
struct delayed_work associate_procedure_wq;
struct delayed_work softmac_scan_wq;
- struct delayed_work softmac_hint11d_wq;
struct delayed_work associate_retry_wq;
struct delayed_work start_ibss_wq;
struct delayed_work hw_wakeup_wq;
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 6d11205..3f4a932 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -492,10 +492,6 @@ void rtllib_send_probe_requests(struct rtllib_device
*ieee, u8 is_mesh)
}
}
-static void rtllib_softmac_hint11d_wq(void *data)
-{
-}
-
void rtllib_update_active_chan_map(struct rtllib_device *ieee)
{
memcpy(ieee->active_channel_map, GET_DOT11D_INFO(ieee)->channel_map,
@@ -3045,8 +3041,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
(void *)rtllib_associate_procedure_wq, ieee);
INIT_DELAYED_WORK_RSL(&ieee->softmac_scan_wq,
(void *)rtllib_softmac_scan_wq, ieee);
- INIT_DELAYED_WORK_RSL(&ieee->softmac_hint11d_wq,
- (void *)rtllib_softmac_hint11d_wq, ieee);
INIT_DELAYED_WORK_RSL(&ieee->associate_retry_wq,
(void *)rtllib_associate_retry_wq, ieee);
INIT_WORK_RSL(&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq,
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/16] staging: rtl8192e: Remove rtllib_device::agregation
Variable is always true; Resolve condition where it is used
(and change indentation of conditional expression).
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 1 -
drivers/staging/rtl8192e/rtllib_rx.c | 52 ++-
drivers/staging/rtl8192e/rtllib_softmac.c | 1 -
3 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 74c2a28..fd38c6d 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1758,7 +1758,6 @@ struct rtllib_device {
u8 AsocRetryCount;
struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
struct sk_buff_head skb_aggQ[MAX_QUEUE_SIZE];
- bool aggregation;
boolbdynamic_txpower_enable;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c
b/drivers/staging/rtl8192e/rtllib_rx.c
index 48a188a..da862c3 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1883,38 +1883,34 @@ static void rtllib_parse_mife_generic(struct
rtllib_device *ieee,
}
}
- if (ieee->aggregation) {
- if (network->bssht.bdSupportHT) {
- if (info_element->len >= 4 &&
- info_element->data[0] == 0x00 &&
- info_element->data[1] == 0xe0 &&
- info_element->data[2] == 0x4c &&
- info_element->data[3] == 0x02) {
- ht_realtek_agg_len = min_t(u8,
- info_element->len,
- MAX_IE_LEN);
- memcpy(ht_realtek_agg_buf,
- info_element->data,
- info_element->len);
- }
- if (ht_realtek_agg_len >= 5) {
- network->realtek_cap_exit = true;
- network->bssht.bdRT2RTAggregation = true;
-
- if ((ht_realtek_agg_buf[4] == 1) &&
- (ht_realtek_agg_buf[5] & 0x02))
- network->bssht.bdRT2RTLongSlotTime =
true;
-
- if ((ht_realtek_agg_buf[4] == 1) &&
- (ht_realtek_agg_buf[5] &
RT_HT_CAP_USE_92SE))
- network->bssht.RT2RT_HT_Mode |=
RT_HT_CAP_USE_92SE;
- }
+ if (network->bssht.bdSupportHT) {
+ if (info_element->len >= 4 &&
+ info_element->data[0] == 0x00 &&
+ info_element->data[1] == 0xe0 &&
+ info_element->data[2] == 0x4c &&
+ info_element->data[3] == 0x02) {
+ ht_realtek_agg_len = min_t(u8, info_element->len,
+ MAX_IE_LEN);
+ memcpy(ht_realtek_agg_buf, info_element->data,
+ info_element->len);
}
if (ht_realtek_agg_len >= 5) {
- if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
- network->bssht.RT2RT_HT_Mode |=
RT_HT_CAP_USE_SOFTAP;
+ network->realtek_cap_exit = true;
+ network->bssht.bdRT2RTAggregation = true;
+
+ if ((ht_realtek_agg_buf[4] == 1) &&
+ (ht_realtek_agg_buf[5] & 0x02))
+ network->bssht.bdRT2RTLongSlotTime = true;
+
+ if ((ht_realtek_agg_buf[4] == 1) &&
+ (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))
+ network->bssht.RT2RT_HT_Mode |=
RT_HT_CAP_USE_92SE;
}
}
+ if (ht_realtek_agg_len >= 5) {
+ if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
+ network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;
+ }
if ((info_element->len >= 3 &&
info_element->data[0] == 0x00 &&
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 3f4a932..444fac7 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3017,7 +3017,6 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
ieee->is_set_key = false;
init_mgmt_queue(ieee);
- ieee->aggregation = true;
ieee->tx_pending.txb = NULL;
_setup_timer(&ieee->associate_timer,
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 11/16] staging: rtl8192e: Remove WIRELESS_EXT checks
Current WIRELESS_EXT version is at least 22.
Resolve ifdefs and delete dead code.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtllib.h | 12
1 file changed, 12 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 22cbd45..f785e84 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -421,16 +421,6 @@ struct ieee_param {
} u;
};
-
-#if WIRELESS_EXT < 17
-#define IW_QUAL_QUAL_INVALID 0x10
-#define IW_QUAL_LEVEL_INVALID 0x20
-#define IW_QUAL_NOISE_INVALID 0x40
-#define IW_QUAL_QUAL_UPDATED 0x1
-#define IW_QUAL_LEVEL_UPDATED 0x2
-#define IW_QUAL_NOISE_UPDATED 0x4
-#endif
-
#define msleep_interruptible_rsl msleep_interruptible
/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
@@ -2151,11 +2141,9 @@ extern int rtllib_wx_set_encode(struct rtllib_device
*ieee,
extern int rtllib_wx_get_encode(struct rtllib_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *key);
-#if WIRELESS_EXT >= 18
extern int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);
-#endif
extern int rtllib_wx_set_auth(struct rtllib_device *ieee,
struct iw_request_info *info,
struct iw_param *data, char *extra);
--
1.8.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 14/16] staging: rtl8192e: Remove unused rtllib_device members
Delete several members of rtllib_device including
their initializers if needed.
Signed-off-by: Mateusz Kulikowski
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 --
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 1 -
drivers/staging/rtl8192e/rtllib.h| 12
drivers/staging/rtl8192e/rtllib_module.c | 3 ---
drivers/staging/rtl8192e/rtllib_softmac.c| 6 --
5 files changed, 28 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 71289ca..49110d3 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1059,8 +1059,6 @@ static void rtl8192_init_priv_handler(struct net_device
*dev)
priv->rtllib->UpdateBeaconInterruptHandler = NULL;
priv->rtllib->ScanOperationBackupHandler = PHY_ScanOperationBackup8192;
-
- priv->rtllib->rtllib_rfkill_poll = NULL;
}
static void rtl8192_init_priv_constant(struct net_device *dev)
@@ -1080,7 +1078,6 @@ static void rtl8192_init_priv_variable(struct net_device
*dev)
priv->AcmMethod = eAcmWay2_SW;
priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
- priv->rtllib->hwscan_sem_up = 1;
priv->rtllib->status = 0;
priv->polling_timer_on = 0;
priv->up_first_time = 1;
@@ -1150,10 +1147,7 @@ static void rtl8192_init_priv_variable(struct net_device
*dev)
priv->rtllib->host_encrypt = 1;
priv->rtllib->host_decrypt = 1;
- priv->rtllib->dot11PowerSaveMode = eActive;
priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
- priv->rtllib->MaxMssDensity = 0;
- priv->rtllib->MinSpaceCfg = 0;
priv->card_type = PCI;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 8532e0c..1b21f38 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1812,7 +1812,6 @@ static void dm_init_ctstoself(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
priv->rtllib->bCTSToSelfEnable = true;
- priv->rtllib->CTSToSelfTH = CTSToSelfTHVal;
}
static void dm_ctstoself(struct net_device *dev)
diff --git a/drivers/staging/rtl8192e/rtllib.h
b/drivers/staging/rtl8192e/rtllib.h
index 49f31ec..f3a4bbc 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1538,8 +1538,6 @@ struct rtllib_device {
bool disable_mgnt_queue;
unsigned long status;
- short hwscan_ch_bk;
- u8 hwscan_sem_up;
u8 CntAfterLink;
enum rt_op_mode OpMode;
@@ -1557,7 +1555,6 @@ struct rtllib_device {
bool ieee_up;
bool cannot_notify;
bool bSupportRemoteWakeUp;
- enum rt_ps_mode dot11PowerSaveMode;
bool actscanning;
bool FirstIe_InScan;
bool be_scan_inprogress;
@@ -1567,7 +1564,6 @@ struct rtllib_device {
bool is_set_key;
bool wx_set_enc;
struct rt_hi_throughput *pHTInfo;
- spinlock_t bw_spinlock;
spinlock_t reorder_spinlock;
u8 Regdot11HTOperationalRateSet[16];
@@ -1576,12 +1572,9 @@ struct rtllib_device {
u8 RegHTSuppRateSet[16];
u8 HTCurrentOperaRate;
u8 HTHighestOperaRate;
- u8 MinSpaceCfg;
- u8 MaxMssDensity;
u8 bTxDisableRateFallBack;
u8 bTxUseDriverAssingedRate;
u8 bTxEnableFwCalcDur;
- atomic_tatm_chnlop;
atomic_tatm_swbw;
struct list_headTx_TS_Admit_List;
@@ -1634,7 +1627,6 @@ struct rtllib_device {
int ieee802_1x; /* is IEEE 802.1X used */
/* WPA data */
- bool bHalfNMode;
bool bHalfWirelessN24GMode;
int wpa_enabled;
int drop_unencrypted;
@@ -1766,14 +1758,11 @@ struct rtllib_device {
u8 AsocRetryCount;
struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
struct sk_buff_head skb_aggQ[MAX_QUEUE_SIZE];
- u32 sta_edca_param[4];
bool aggregation;
- bool enable_rx_imm_BA;
boolbdynamic_txpower_enable;
bool bCTSToSelfEnable;
- u8 CTSToSelfTH;
u32 fsync_time_interval;
u32 fsync_rate_bitmap;
@@ -1929,7 +1918,6 @@ struct rtllib_device {
void (*rtllib_ips_leave_wq)(struct net_device *dev);
void (*rtllib_ips_leave)(struct net_device *dev);
void (*LeisurePSLeave)(struct net_device *dev);
- void (*rtllib_rfkill_poll)(struct net_device *dev);
/* This must be the last item so that it points to the data
* allocated beyond this structure by alloc_rtllib
diff --git a/drivers/staging/rtl8192e/rtllib_module.c
b/drivers/staging/rtl8192e/rtllib_module.c
index 845d9b8..578b41b 100644
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_mod
[PATCH] staging: rtl8192u: ieee80211: Fix incorrect type in assignment
Added le16_to_cpu() conversion fixing the following warning in assignment
detected by sparse:
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2157:30: warning:
invalid assignment: +=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2157:30:left side
has type unsigned long
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:2157:30:right side
has type restricted __le16
Signed-off-by: Gaston Gonzalez
---
I wonder if this is the best approach, making payload_size u16 in ieee80211.h
would fix this plus other three sparse warnings. Could we make payload_size u16
or it must be definitely le16?
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 5fbade4..1b11acb 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -2154,7 +2154,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb,
struct ieee80211_device *
ieee80211_sta_wakeup(ieee, 0);
/* update the tx status */
- ieee->stats.tx_bytes += txb->payload_size;
+ ieee->stats.tx_bytes += le16_to_cpu(txb->payload_size);
ieee->stats.tx_packets++;
tcb_desc = (cb_desc *)(txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE);
if (tcb_desc->bMulticast) {
--
2.4.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: update TODO list
On 2015년 06월 12일 20:07, Sudip Mukherjee wrote: On Fri, Jun 12, 2015 at 07:23:11PM +0900, Dean Lee wrote: remove complete OS wrapper functions. just a minor thing. It will be easy if you send your patches in series instead of separate patches. your patch "remove oswrapper & type file" is dependent on one of the previous patch that you have sent today. If for some reason that previous patch is not applied then "remove oswrapper & type file" will not apply and then this patch will have no meaning. regards sudip Thanks for your comment. i'll fix them. B.R dean ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: remove warnings reported by checkpatch.pl.
On 2015년 06월 12일 23:34, Greg KH wrote:
On Fri, Jun 12, 2015 at 06:51:56PM +0900, Dean Lee wrote:
Remove the following warnings in the wilc_log.h:
- unnecessary whitespace before a quoted newline
- line over 80 characters
- single statement macros should not use a do {} while (0) loop.
Those are different things, so this should be broken up into different
patches. Please make this a series of patches, each one only doing one
type of thing.
thanks,
greg k-h
thanks for your comment.
i'll make seperate patch.
B.R
dean
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3] staging: wilc1000: remove oswrapper & type file
On 2015년 06월 13일 00:26, Greg KH wrote:
On Fri, Jun 12, 2015 at 07:21:11PM +0900, Dean Lee wrote:
remove OS Wrapper function(wilc_oswrapper.h) is in our plan.
i removed OS Wrapper function and it's done.
and i found wilc_type.h file is does not used it.
so i deleted them and modify #include line in another file.
You are also doing other things here that you don't describe:
/* Errors will always get printed */
-#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_ERROR(...)
\
+do { \
+ WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__);\
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
You reformatted this.
#if (WILC_LOG_VERBOSITY_LEVEL > 3)
-#define WILC_FN_IN do { WILC_PRINTF("(FIN) (%s:%d) \n", __WILC_FUNCTION__,
__WILC_LINE__); } while (0)
-#define WILC_FN_OUT(ret) do { WILC_PRINTF("(FOUT) (%s:%d) %d.\n",
__WILC_FUNCTION__, __WILC_LINE__, (ret)); } while (0)
+#define WILC_FN_IN \
+ WILC_PRINTF("(FIN)(%s:%d)\n", __WILC_FUNCTION__, __WILC_LINE__)
+#define WILC_FN_OUT(ret) \
+ WILC_PRINTF("(FOUT)(%s:%d)%d\n", __WILC_FUNCTION__, __WILC_LINE__, ret)
And changed this for no obvious reason.
Please, only do one thing per patch. Break this up into logical steps
and resend it as a series of patches, with the last one being the TODO
file item removal.
thanks,
greg k-h
so sorry...i missed it. :'-(
i'll make v2 patch about fix them.
B.R
dean
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: change WILC_Char to s8
On 2015년 06월 13일 00:28, Greg KH wrote: On Fri, Jun 12, 2015 at 02:39:08PM +0900, Dean Lee wrote: change own data type(WILC_Char) to common data type(s8) Why not just 'char'? And you are using these in "strings", so why not u8? thanks, greg k-h i research some documents for change to common data type. that's saying 's8' is 'signed char'. 'WILC_Char' is redefine 'char'. so i changed 'WILC_Char' to 's8' and i try find when using this type in our source code after received your comment. i'll fix and resend v2 version. thanks. B.R dean ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: change WILC_Char to s8
On Mon, Jun 15, 2015 at 09:47:04AM +0900, Dean.lee wrote: > > > On 2015년 06월 13일 00:28, Greg KH wrote: > >On Fri, Jun 12, 2015 at 02:39:08PM +0900, Dean Lee wrote: > >>change own data type(WILC_Char) to common data type(s8) > >Why not just 'char'? > > > >And you are using these in "strings", so why not u8? > > > >thanks, > > > >greg k-h > i research some documents for change to common data type. > that's saying 's8' is 'signed char'. > > 'WILC_Char' is redefine 'char'. so i changed 'WILC_Char' to 's8' Then stick to 'char', don't change the type. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: wilc1000: change WILC_Char to char
change own data type(WILC_Char) to common data type(char)
Signed-off-by: Dean Lee
---
Change v2:
replace data type s8 -> char
---
drivers/staging/wilc1000/coreconfigurator.c | 24 +++
drivers/staging/wilc1000/coreconfigurator.h | 4 +-
drivers/staging/wilc1000/host_interface.c | 88 +++
drivers/staging/wilc1000/wilc_memory.c| 8 +--
drivers/staging/wilc1000/wilc_memory.h| 8 +--
drivers/staging/wilc1000/wilc_oswrapper.h | 3 -
drivers/staging/wilc1000/wilc_strutils.c | 6 +-
drivers/staging/wilc1000/wilc_strutils.h | 6 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +-
9 files changed, 75 insertions(+), 78 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c
b/drivers/staging/wilc1000/coreconfigurator.c
index 792ba6d..bbb3231 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -141,7 +141,7 @@ typedef enum {
typedef struct {
- WILC_Char *pcRespBuffer;
+ char *pcRespBuffer;
s32 s32MaxRespBuffLen;
s32 s32BytesRead;
bool bRespRequired;
@@ -339,7 +339,7 @@ INLINE u8 get_hex_char(u8 inp)
/* This function extracts the MAC address held in a string in standard format
*/
/* into another buffer as integers.
*/
-INLINE u16 extract_mac_addr(WILC_Char *str, u8 *buff)
+INLINE u16 extract_mac_addr(char *str, u8 *buff)
{
*buff = 0;
while (*str != '\0') {
@@ -1095,7 +1095,7 @@ s32 DeallocateSurveyResults(wid_site_survey_reslts_s
*pstrSurveyResults)
/* */
/*/
-void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessCharWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal)
{
u8 *pu8val = (u8 *)ps8WidVal;
@@ -1149,7 +1149,7 @@ void ProcessCharWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessShortWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal)
{
u16 *pu16val = (u16 *)ps8WidVal;
@@ -1204,7 +1204,7 @@ void ProcessShortWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessIntWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, s8 *ps8WidVal)
{
u32 *pu32val = (u32 *)ps8WidVal;
@@ -1262,7 +1262,7 @@ void ProcessIntWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessIPwid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8ip)
{
u32 u32val = 0;
@@ -1320,7 +1320,7 @@ void ProcessIPwid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessStrWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{
u16 u16MsgLen = 0;
@@ -1377,7 +1377,7 @@ void ProcessStrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessAdrWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val)
{
u16 u16MsgLen = 0;
@@ -1441,7 +1441,7 @@ void ProcessAdrWid(WILC_Char *pcPacket, s32 *ps32PktLen,
/* */
/*/
-void ProcessBinWid(WILC_Char *pcPacket, s32 *ps32PktLen,
+void ProcessBinWid(char *pcPacket, s32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize)
{
/* WILC_ERROR("processing Binary WIDs is not supported\n"); */
@@ -1802,7 +1802,7 @@ s32 ParseWriteResponse(u8 *pu8RespBuffer)
* @version 1.0
*/
-s32 CreatePacketHeader(WILC_Char *pcpacket, s32 *ps32PacketLength)
+s32 CreatePacketHeader(char *pcpacket, s32 *ps32PacketLength)
{
s32 s32Error = WILC_
Re: [PATCH] Staging: sm750fb: fix checkpatch.pl indentation warnings
On Sun, Jun 14, 2015 at 08:45:02PM +0200, Markus Böhme wrote: > >This patch fixes indentation issues by replacing spaces by tabs at > >the start of line > > > >Signed-off-by: Niranjan Dighe > > > >diff --git a/drivers/staging/sm750fb/ddk750_dvi.c > >b/drivers/staging/sm750fb/ddk750_dvi.c > >index b2bf7e6..c73b74a 100644 > >--- a/drivers/staging/sm750fb/ddk750_dvi.c > >+++ b/drivers/staging/sm750fb/ddk750_dvi.c > > >-if(pCurrentDviCtrl->pfnInit != NULL) > >+if (pCurrentDviCtrl->pfnInit != NULL) > > You are fixing a different type of warning here. Please make only one > kind of change per patch. > > Regards, > Markus > Hello Markus, Thanks for your review. I will correct and resend a new patch. Please disregard this for the moment. Thanks, Niranjan Dighe ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: doubt about sm7xxfb (was: Re: [PATCH v4 0/7] staging: fsl-mc: New functionality to the MC bus driver)
On Sat, Jun 13, 2015 at 09:57:05AM -0700, Joe Perches wrote: > > It seems ready to me. > > As far as I can tell, there's just a few niggles > that could be done: > > Something like (too lazy to separate them into multiple patches) Thanks. I will break into patches. Call me lazy for not having it done till now. > > o reduce indentation a couple of places > o add newlines to logging messages > o add const to static array > o use consistent function declaration style > > It's unfortunate there are so many #ifdef __BIG_ENDIAN uses. instead of #ifdef __BIG_ENDIAN can i then use a bool flag to check by if-else? regards sudip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: sm750fb: Fix checkpatch.pl warnings
On Sun, Jun 14, 2015 at 05:17:43PM +, Dighe, Niranjan (N.) wrote: > From: Niranjan Dighe > > This patch removes spaces at the start of the line and replaces it > by tabs You are also removing blank lines, adding blank lines, moving a ')' to next line. regards sudip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2] staging: rtl8723au: include/rtl8723a_hal.h: use __leXX types in fw header struct
On Sun, Jun 14, 2015 at 11:26:35PM +0200, Daniele Alessandrelli wrote:
> This patch makes field in struct rt_8723a_firmware_hdr use endianness-aware
> types (__leXX), thus fixing the following sparse warnings:
>
>
> Signed-off-by: Daniele Alessandrelli
> ---
> drivers/staging/rtl8723au/include/rtl8723a_hal.h | 17 +
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
> b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
> index d40e420..743b52a 100644
> --- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
> +++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
> @@ -80,10 +80,11 @@ struct rt_8723a_firmware_hdr {
> /* 8-byte alinment required */
>
> /* LONG WORD 0 */
> - u16 Signature; /* 92C0: test chip; 92C, 88C0: test
> chip; 88C1: MP A-cut; 92C1: MP A-cut */
> + __le16 Signature; /* 92C0: test chip; 92C, 88C0: test chip;
> + * 88C1: MP A-cut; 92C1: MP A-cut */
you have also reformatted the comment line here and also that is not the
multi line comment style.
regards
sudip
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: doubt about sm7xxfb (was: Re: [PATCH v4 0/7] staging: fsl-mc: New functionality to the MC bus driver)
On Mon, 2015-06-15 at 10:47 +0530, Sudip Mukherjee wrote: > On Sat, Jun 13, 2015 at 09:57:05AM -0700, Joe Perches wrote: > > It's unfortunate there are so many #ifdef __BIG_ENDIAN uses. > instead of #ifdef __BIG_ENDIAN can i then use a bool flag to check by if-else? I think that'd be worse. Moving the #ifdef into the .h may be better, but , whatever works well enough. Another thing may be to move the vgamode array declaration in fb7xx.h to the .c file and make it const and remove the #define numvgamodes and just use ARRAY_SIZE directly in the one place it's used. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue()
On Mon, Jun 15, 2015 at 12:58:50AM +0200, Mateusz Kulikowski wrote: > This function was declared but never unused. After this patch we are getting two build warnings: warning: ‘dequeue_mgmt’ defined but not used warning: ‘rtllib_resume_tx’ defined but not used regards sudip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue()
On June 15, 2015 8:38:01 AM GMT+02:00, Sudip Mukherjee wrote: >On Mon, Jun 15, 2015 at 12:58:50AM +0200, Mateusz Kulikowski wrote: >> This function was declared but never unused. >After this patch we are getting two build warnings: > >warning: ‘dequeue_mgmt’ defined but not used >warning: ‘rtllib_resume_tx’ defined but not used It's handled in next patch (7/16). Regards Mateusz ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue()
On Mon, Jun 15, 2015 at 08:41:17AM +0200, Mateusz Kulikowski wrote: > > > On June 15, 2015 8:38:01 AM GMT+02:00, Sudip Mukherjee > wrote: > >On Mon, Jun 15, 2015 at 12:58:50AM +0200, Mateusz Kulikowski wrote: > >> This function was declared but never unused. > >After this patch we are getting two build warnings: > > > >warning: ‘dequeue_mgmt’ defined but not used > >warning: ‘rtllib_resume_tx’ defined but not used > > It's handled in next patch (7/16). Yes, just saw that. But 7/16 and 6/16 has to be combined together. our patches should never introduce build warnings. regards sudip > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue()
On 15 June 2015 at 08:52, Sudip Mukherjee wrote: > On Mon, Jun 15, 2015 at 08:41:17AM +0200, Mateusz Kulikowski wrote: >> >> >> On June 15, 2015 8:38:01 AM GMT+02:00, Sudip Mukherjee >> wrote: >> >On Mon, Jun 15, 2015 at 12:58:50AM +0200, Mateusz Kulikowski wrote: >> >> This function was declared but never unused. >> >After this patch we are getting two build warnings: >> > >> >warning: ‘dequeue_mgmt’ defined but not used >> >warning: ‘rtllib_resume_tx’ defined but not used >> >> It's handled in next patch (7/16). > Yes, just saw that. But 7/16 and 6/16 has to be combined together. > our patches should never introduce build warnings. Ok. Sorry for that. Regards, Mateusz. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
