patch to add a success/failure message to comedi autoconfig
Hi all,
I've added a success / fail message to comedi autoconfig. That's badly
needed to see which driver has been associated with which comedi dev in
udev. Also, as far as I know an error in the USB probe callback won't
cause the kernel to print any errors so tracking down failures in
autoconfig would be really tricky.
/Bernd
--
http://www.berndporr.me.uk
http://www.linux-usb-daq.co.uk
http://www.imdb.com/name/nm3293421/
+44 (0)7840 340069
From e516c966fb36a9a8fee3e743ec97d4732cd9285c Mon Sep 17 00:00:00 2001
From: Bernd Porr m...@berndporr.me.uk
Date: Sat, 21 Dec 2013 09:52:11 +
Subject: [PATCH 1/1] Added success message to the driver autoconfig and error
message in case it fails. A success message is required so that the user can
find out which comedi driver has been associated with which udev device. This
also makes troubleshooting much easier when more than one card is in the
computer or a mix of USB and PCI devices.
Signed-off-by: Bernd Porr m...@berndporr.me.uk
---
drivers/staging/comedi/comedi_fops.c | 1 +
drivers/staging/comedi/drivers.c | 17 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 33b4e58..4e53c5d 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2523,6 +2523,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
return ERR_PTR(-EBUSY);
}
dev-minor = i;
+
csdev = device_create(comedi_class, hardware_device,
MKDEV(COMEDI_MAJOR, i), NULL, comedi%i, i);
if (!IS_ERR(csdev))
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 29b3480..f9be097 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -585,8 +585,12 @@ int comedi_auto_config(struct device *hardware_device,
}
dev = comedi_alloc_board_minor(hardware_device);
- if (IS_ERR(dev))
+ if (IS_ERR(dev)) {
+ dev_warn(hardware_device,
+ comedi driver '%s' could not create device.\n,
+ driver-driver_name);
return PTR_ERR(dev);
+ }
/* Note: comedi_alloc_board_minor() locked dev-mutex. */
dev-driver = driver;
@@ -598,8 +602,17 @@ int comedi_auto_config(struct device *hardware_device,
comedi_device_detach(dev);
mutex_unlock(dev-mutex);
- if (ret 0)
+ if (ret 0) {
+ dev_warn(hardware_device,
+ comedi driver '%s' could not be auto-configured.\n,
+ driver-driver_name);
comedi_release_hardware_device(hardware_device);
+ } else {
+ /* class_dev should be set properly here after a successul auto config*/
+ dev_info(dev-class_dev,
+ '%s' has been successfully auto-configured.\n,
+ driver-driver_name);
+ }
return ret;
}
EXPORT_SYMBOL_GPL(comedi_auto_config);
--
1.8.5.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/31] staging: r8188eu: Replace wrappers ODM_sleep_us and rtw_usleep_os
Each of the uses in the code asks for a sleep of 100 usec or so. On Linux,
these are converted to msleep(1).
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8188eu/hal/odm_interface.c | 6 --
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 6 +++---
drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 16
drivers/staging/rtl8188eu/include/odm_interface.h | 2 --
drivers/staging/rtl8188eu/include/osdep_service.h | 2 --
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 8
7 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index d5ad1dc..c011efe 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -396,7 +396,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
DBG_88E(%s: Wait for FW LPS leave more than %u
ms!!!\n, __func__, delay_ms);
break;
}
- rtw_usleep_os(100);
+ msleep(1);
}
return err;
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index e7fee79..780cb11 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -146,12 +146,6 @@ void ODM_IsWorkItemScheduled(void *pRtWorkItem)
{
}
-/* ODM Timer relative API. */
-void ODM_sleep_us(u32 us)
-{
- rtw_usleep_os(us);
-}
-
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay)
{
_set_timer(pTimer, msDelay); /* ms */
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index d81193b..5921db8 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -242,7 +242,7 @@ static void efuse_read_phymap_from_txpktbuf(
while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG))
(passing_time = rtw_get_passing_time_ms(start)) 1000) {
DBG_88E(%s polling reg_0x143:0x%02x,
reg_0x106:0x%02x\n, __func__, reg_0x143, rtw_read8(adapter, 0x106));
- rtw_usleep_os(100);
+ msleep(1);
}
lo32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_L);
@@ -372,7 +372,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,
int data_len)
if (pbuf) {
for (addr = 0; addr data_cnts; addr++) {
rtw_write32(Adapter, 0x140, addr);
- rtw_usleep_os(2);
+ msleep(1);
loop = 0;
do {
rstatus = (reg_140 = rtw_read32(Adapter,
REG_PKTBUF_DBG_CTRL)BIT24);
@@ -383,7 +383,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,
int data_len)
fifo_data = rtw_read32(Adapter,
REG_PKTBUF_DBG_DATA_H);
memcpy(pbuf+(addr*8+4), fifo_data, 4);
}
- rtw_usleep_os(2);
+ msleep(1);
} while (!rstatus (loop++ 10));
}
rtw_IOL_cmd_buf_dump(Adapter, data_len, pbuf);
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
index ec4fb023..e5dc036 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
@@ -663,18 +663,18 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8
bStart)
if (is92C) {
_write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x01);
- rtw_usleep_os(100);
+ msleep(1);
if (rfPath == RF_PATH_A)
write_rfreg(pAdapter, RF_PATH_B, 0x00,
0x1); /* PAD all on. */
else if (rfPath == RF_PATH_B)
write_rfreg(pAdapter, RF_PATH_A, 0x00,
0x1); /* PAD all on. */
write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /* PAD
all on. */
- rtw_usleep_os(100);
+ msleep(1);
} else {
write_rfreg(pAdapter, rfPath, 0x21, 0xd4000);
- rtw_usleep_os(100);
+ msleep(1);
write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /* PAD
all on. */
- rtw_usleep_os(100);
+ msleep(1);
}
/* for dynamic set Power index. */
@@ -696,15 +696,15 @@ void
[PATCH 07/31] staging: r8188eu: Replace wrappers for atomic_inc and atomic_inc_return
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 ++--
drivers/staging/rtl8188eu/include/osdep_service.h | 4
drivers/staging/rtl8188eu/include/usb_ops.h | 2 +-
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 10 --
4 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index f7bf98b..6f7e415 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -7070,7 +7070,7 @@ void report_survey_event(struct adapter *padapter, union
recv_frame *precv_frame
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr-len = sizeof(struct survey_event);
pc2h_evt_hdr-ID = GEN_EVT_CODE(_Survey);
- pc2h_evt_hdr-seq = ATOMIC_INC_RETURN(pmlmeext-event_seq);
+ pc2h_evt_hdr-seq = atomic_inc_return(pmlmeext-event_seq);
psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct
C2HEvent_Header));
@@ -7122,7 +7122,7 @@ void report_surveydone_event(struct adapter *padapter)
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr-len = sizeof(struct surveydone_event);
pc2h_evt_hdr-ID = GEN_EVT_CODE(_SurveyDone);
- pc2h_evt_hdr-seq = ATOMIC_INC_RETURN(pmlmeext-event_seq);
+ pc2h_evt_hdr-seq = atomic_inc_return(pmlmeext-event_seq);
psurveydone_evt = (struct surveydone_event *)(pevtcmd + sizeof(struct
C2HEvent_Header));
psurveydone_evt-bss_cnt = pmlmeext-sitesurvey_res.bss_cnt;
@@ -7168,7 +7168,7 @@ void report_join_res(struct adapter *padapter, int res)
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr-len = sizeof(struct joinbss_event);
pc2h_evt_hdr-ID = GEN_EVT_CODE(_JoinBss);
- pc2h_evt_hdr-seq = ATOMIC_INC_RETURN(pmlmeext-event_seq);
+ pc2h_evt_hdr-seq = atomic_inc_return(pmlmeext-event_seq);
pjoinbss_evt = (struct joinbss_event *)(pevtcmd + sizeof(struct
C2HEvent_Header));
memcpy((unsigned char *)((pjoinbss_evt-network.network)),
(pmlmeinfo-network), sizeof(struct wlan_bssid_ex));
@@ -7221,7 +7221,7 @@ void report_del_sta_event(struct adapter *padapter,
unsigned char *MacAddr, unsi
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr-len = sizeof(struct stadel_event);
pc2h_evt_hdr-ID = GEN_EVT_CODE(_DelSTA);
- pc2h_evt_hdr-seq = ATOMIC_INC_RETURN(pmlmeext-event_seq);
+ pc2h_evt_hdr-seq = atomic_inc_return(pmlmeext-event_seq);
pdel_sta_evt = (struct stadel_event *)(pevtcmd + sizeof(struct
C2HEvent_Header));
memcpy((unsigned char *)((pdel_sta_evt-macaddr)), MacAddr, ETH_ALEN);
@@ -7276,7 +7276,7 @@ void report_add_sta_event(struct adapter *padapter,
unsigned char *MacAddr, int
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr-len = sizeof(struct stassoc_event);
pc2h_evt_hdr-ID = GEN_EVT_CODE(_AddSTA);
- pc2h_evt_hdr-seq = ATOMIC_INC_RETURN(pmlmeext-event_seq);
+ pc2h_evt_hdr-seq = atomic_inc_return(pmlmeext-event_seq);
padd_sta_evt = (struct stassoc_event *)(pevtcmd + sizeof(struct
C2HEvent_Header));
memcpy((unsigned char *)((padd_sta_evt-macaddr)), MacAddr, ETH_ALEN);
@@ -8322,7 +8322,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char
*pbuf)
goto _abort_event_;
}
- ATOMIC_INC(pevt_priv-event_seq);
+ atomic_inc(pevt_priv-event_seq);
peventbuf += 2;
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 593d5a8..6dc0707 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -357,10 +357,6 @@ static inline u32 bitshift(u32 bitmask)
/* limitation of path length */
#define PATH_LENGTH_MAX PATH_MAX
-/* Atomic integer operations */
-void ATOMIC_INC(atomic_t *v);
-int ATOMIC_INC_RETURN(atomic_t *v);
-
struct rtw_netdev_priv_indicator {
void *priv;
u32 sizeof_priv;
diff --git a/drivers/staging/rtl8188eu/include/usb_ops.h
b/drivers/staging/rtl8188eu/include/usb_ops.h
index b424442..7d33477 100644
--- a/drivers/staging/rtl8188eu/include/usb_ops.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops.h
@@ -77,7 +77,7 @@ static inline int rtw_inc_and_chk_continual_urb_error(struct
dvobj_priv *dvobj)
{
int ret = false;
int value;
- value = ATOMIC_INC_RETURN(dvobj-continual_urb_error);
+ value = atomic_inc_return(dvobj-continual_urb_error);
if (value MAX_CONTINUAL_URB_ERR) {
DBG_88E([dvobj:%p][ERROR] continual_urb_error:%d %d\n,
dvobj, value, MAX_CONTINUAL_URB_ERR);
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
[PATCH 02/31] staging: r8188eu: Replace wrapper rtw_yield_os
a simple yield() is sufficient.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 2 --
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 -
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 9938e22..7c467ae 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -6333,7 +6333,7 @@ unsigned int send_beacon(struct adapter *padapter)
issue_beacon(padapter, 100);
issue++;
do {
- rtw_yield_os();
+ yield();
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8
*)(bxmitok));
poll++;
} while ((poll%10) != 0 !bxmitok
!padapter-bSurpriseRemoved !padapter-bDriverStopped);
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index b409b69..ca0a708 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -655,7 +655,7 @@ _func_enter_;
SetFwRsvdPagePkt(adapt, false);
DLBcnCount++;
do {
- rtw_yield_os();
+ yield();
/* mdelay(10); */
/* check rsvd page download OK. */
rtw_hal_get_hwreg(adapt, HW_VAR_BCN_VALID, (u8
*)(bcn_valid));
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 818bb91..00c349e 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -277,8 +277,6 @@ void rtw_sleep_schedulable(int ms);
u32 rtw_atoi(u8 *s);
-void rtw_yield_os(void);
-
static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)
{
return del_timer_sync(ptimer);
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index aedc016..2261342 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -245,11 +245,6 @@ void rtw_sleep_schedulable(int ms)
return;
}
-void rtw_yield_os(void)
-{
- yield();
-}
-
#define RTW_SUSPEND_LOCK_NAME rtw_wifi
inline void rtw_suspend_lock_init(void)
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 11/31] staging: r8188eu: Remove wrapper around mutex_destroy
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 1 -
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 -
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 4 ++--
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index b1af4ef..026645c 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -277,7 +277,7 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
rtw_free_hwxmits(padapter);
- _rtw_mutex_free(pxmitpriv-ack_tx_mutex);
+ mutex_destroy(pxmitpriv-ack_tx_mutex);
out:
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 3ea97fd..7956f0c 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -257,7 +257,6 @@ void rtw_list_insert_tail(struct list_head *plist, struct
list_head *phead);
void rtw_list_delete(struct list_head *plist);
u32 _rtw_down_sema(struct semaphore *sema);
-void _rtw_mutex_free(struct mutex *pmutex);
void _rtw_init_queue(struct __queue *pqueue);
u32 _rtw_queue_empty(struct __queue *pqueue);
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 23d39cc..8c3b077 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -169,11 +169,6 @@ u32 _rtw_down_sema(struct semaphore *sema)
return _SUCCESS;
}
-void _rtw_mutex_free(struct mutex *pmutex)
-{
- mutex_destroy(pmutex);
-}
-
void _rtw_init_queue(struct __queue *pqueue)
{
_rtw_init_listhead((pqueue-queue));
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 32d1e97..35107fd 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -144,7 +144,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
u8 rst = _SUCCESS;
kfree(dvobj-usb_alloc_vendor_req_buf);
- _rtw_mutex_free(dvobj-usb_vendor_req_mutex);
+ mutex_destroy(dvobj-usb_vendor_req_mutex);
return rst;
}
@@ -881,7 +881,7 @@ static void __exit rtw_drv_halt(void)
usb_drv-drv_registered = false;
usb_deregister(usb_drv-usbdrv);
- _rtw_mutex_free(usb_drv-hw_init_mutex);
+ mutex_destroy(usb_drv-hw_init_mutex);
DBG_88E(-rtw_drv_halt\n);
}
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/31] staging: r8188eu: Remove daemonize conditional
The current kernels do not include this entry point. Delete the call.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/include/osdep_service.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 6dc0707..b36fc20 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -284,9 +284,6 @@ static inline unsigned char _cancel_timer_ex(struct
timer_list *ptimer)
static inline void thread_enter(char *name)
{
-#ifdef daemonize
- daemonize(%s, name);
-#endif
allow_signal(SIGTERM);
}
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/31] staging: r8188eu: Remove wrapper code for rtw_suspend_lock_init, rtw_suspend_lock_uninit, rtw_lock_suspend, and rtw_unlock_suspend
All of these routines are empty.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/include/osdep_service.h | 5 -
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 16
drivers/staging/rtl8188eu/os_dep/rtw_android.c| 2 --
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 4
4 files changed, 27 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 00c349e..091ca4b 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -357,11 +357,6 @@ static inline u32 bitshift(u32 bitmask)
/* limitation of path length */
#define PATH_LENGTH_MAX PATH_MAX
-void rtw_suspend_lock_init(void);
-void rtw_suspend_lock_uninit(void);
-void rtw_lock_suspend(void);
-void rtw_unlock_suspend(void);
-
/* Atomic integer operations */
#define ATOMIC_T atomic_t
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 2261342..9c3e410 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -247,22 +247,6 @@ void rtw_sleep_schedulable(int ms)
#define RTW_SUSPEND_LOCK_NAME rtw_wifi
-inline void rtw_suspend_lock_init(void)
-{
-}
-
-inline void rtw_suspend_lock_uninit(void)
-{
-}
-
-inline void rtw_lock_suspend(void)
-{
-}
-
-inline void rtw_unlock_suspend(void)
-{
-}
-
inline void ATOMIC_SET(ATOMIC_T *v, int i)
{
atomic_set(v, i);
diff --git a/drivers/staging/rtl8188eu/os_dep/rtw_android.c
b/drivers/staging/rtl8188eu/os_dep/rtw_android.c
index 6cf71cc..a3c2bc5 100644
--- a/drivers/staging/rtl8188eu/os_dep/rtw_android.c
+++ b/drivers/staging/rtl8188eu/os_dep/rtw_android.c
@@ -159,7 +159,6 @@ int rtw_android_priv_cmd(struct net_device *net, struct
ifreq *ifr, int cmd)
int bytes_written = 0;
struct android_wifi_priv_cmd priv_cmd;
- rtw_lock_suspend();
if (!ifr-ifr_data) {
ret = -EINVAL;
goto exit;
@@ -287,7 +286,6 @@ response:
ret = bytes_written;
}
exit:
- rtw_unlock_suspend();
kfree(command);
return ret;
}
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 527d4e7..28903aa 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -867,8 +867,6 @@ static int __init rtw_drv_entry(void)
DBG_88E(DRV_NAME driver version=%s\n, DRIVERVERSION);
DBG_88E(build time: %s %s\n, __DATE__, __TIME__);
- rtw_suspend_lock_init();
-
_rtw_mutex_init(usb_drv-hw_init_mutex);
usb_drv-drv_registered = true;
@@ -880,8 +878,6 @@ static void __exit rtw_drv_halt(void)
RT_TRACE(_module_hci_intfs_c_, _drv_err_, (+rtw_drv_halt\n));
DBG_88E(+rtw_drv_halt\n);
- rtw_suspend_lock_uninit();
-
usb_drv-drv_registered = false;
usb_deregister(usb_drv-usbdrv);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/31] staging: r8188eu: Replace wrapper around atomic_set()
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 1 -
drivers/staging/rtl8188eu/include/usb_ops.h | 2 +-
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 -
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 281608b..f01564f 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -84,7 +84,7 @@ int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
_func_enter_;
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
- ATOMIC_SET(pevtpriv-event_seq, 0);
+ atomic_set(pevtpriv-event_seq, 0);
pevtpriv-evt_done_cnt = 0;
_init_workitem(pevtpriv-c2h_wk, c2h_wk_callback, NULL);
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 7c467ae..f7bf98b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -221,7 +221,7 @@ static void init_mlme_ext_priv_value(struct adapter
*padapter)
_12M_RATE_, _24M_RATE_, 0xff,
};
- ATOMIC_SET(pmlmeext-event_seq, 0);
+ atomic_set(pmlmeext-event_seq, 0);
pmlmeext-mgnt_seq = 0;/* reset to zero when disconnect at client mode
*/
pmlmeext-cur_channel = padapter-registrypriv.channel;
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index be588aa..7b2e87a 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -358,7 +358,6 @@ static inline u32 bitshift(u32 bitmask)
#define PATH_LENGTH_MAX PATH_MAX
/* Atomic integer operations */
-void ATOMIC_SET(atomic_t *v, int i);
int ATOMIC_READ(atomic_t *v);
void ATOMIC_ADD(atomic_t *v, int i);
void ATOMIC_SUB(atomic_t *v, int i);
diff --git a/drivers/staging/rtl8188eu/include/usb_ops.h
b/drivers/staging/rtl8188eu/include/usb_ops.h
index df34237..b424442 100644
--- a/drivers/staging/rtl8188eu/include/usb_ops.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops.h
@@ -91,7 +91,7 @@ static inline int rtw_inc_and_chk_continual_urb_error(struct
dvobj_priv *dvobj)
*/
static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
{
- ATOMIC_SET(dvobj-continual_urb_error, 0);
+ atomic_set(dvobj-continual_urb_error, 0);
}
#define USB_HIGH_SPEED_BULK_SIZE 512
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 2f064e8..360703d 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -247,11 +247,6 @@ void rtw_sleep_schedulable(int ms)
#define RTW_SUSPEND_LOCK_NAME rtw_wifi
-inline void ATOMIC_SET(atomic_t *v, int i)
-{
- atomic_set(v, i);
-}
-
inline int ATOMIC_READ(atomic_t *v)
{
return atomic_read(v);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 20/31] staging: r8188eu: Remove even more empty routines
This patch removes the following:
odm_DynamicTxPowerAP
odm_RSSIMonitorCheckMP
odm_RSSIMonitorCheckAP
odm_TXPowerTrackingCheckMP
odm_TXPowerTrackingCheckAP
odm_SwAntDivInit
ODM_SwAntDivChkPerPktRssi
odm_SwAntDivChkAntSwitch
ODM_SwAntDivRestAfterLink
dm_GlobalAdapterCheck
odm_dtc
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm.c | 56 -
drivers/staging/rtl8188eu/hal/odm_HWConfig.c| 4 +-
drivers/staging/rtl8188eu/include/odm.h | 4 --
drivers/staging/rtl8188eu/include/odm_precomp.h | 7
4 files changed, 1 insertion(+), 70 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index 683f2bc..f73f3af 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -195,8 +195,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
(pDM_Odm-AntDivType == CGCS_RX_HW_ANTDIV) ||
(pDM_Odm-AntDivType == CG_TRX_SMART_ANTDIV))
odm_InitHybridAntDiv(pDM_Odm);
- else if (pDM_Odm-AntDivType == CGCS_RX_SW_ANTDIV)
- odm_SwAntDivInit(pDM_Odm);
}
}
@@ -206,7 +204,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
{
/* 2012.05.03 Luke: For all IC series */
- odm_GlobalAdapterCheck();
odm_CmnInfoHook_Debug(pDM_Odm);
odm_CmnInfoUpdate_Debug(pDM_Odm);
odm_CommonInfoSelfUpdate(pDM_Odm);
@@ -240,8 +237,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
(pDM_Odm-AntDivType == CGCS_RX_HW_ANTDIV) ||
(pDM_Odm-AntDivType == CG_TRX_SMART_ANTDIV))
odm_HwAntDiv(pDM_Odm);
- else if (pDM_Odm-AntDivType == CGCS_RX_SW_ANTDIV)
- odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_PEAK);
if (pDM_Odm-SupportICType ODM_IC_11AC_SERIES) {
;
@@ -250,7 +245,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
odm_EdcaTurboCheck(pDM_Odm);
odm_DynamicTxPower(pDM_Odm);
}
- odm_dtc(pDM_Odm);
}
/* Init /.. Fixed HW value. Only init time. */
@@ -1453,7 +1447,6 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
odm_DynamicTxPowerNIC(pDM_Odm);
break;
caseODM_AP:
- odm_DynamicTxPowerAP(pDM_Odm);
break;
caseODM_ADSL:
break;
@@ -1471,10 +1464,6 @@ void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm)
}
}
-void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
/* 3 */
/* 3 RSSI Monitor */
/* 3 */
@@ -1491,13 +1480,11 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm)
/* */
switch (pDM_Odm-SupportPlatform) {
caseODM_MP:
- odm_RSSIMonitorCheckMP(pDM_Odm);
break;
caseODM_CE:
odm_RSSIMonitorCheckCE(pDM_Odm);
break;
caseODM_AP:
- odm_RSSIMonitorCheckAP(pDM_Odm);
break;
caseODM_ADSL:
/* odm_DIGAP(pDM_Odm); */
@@ -1506,10 +1493,6 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm)
} /* odm_RSSIMonitorCheck */
-void odm_RSSIMonitorCheckMP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
static void FindMinimumRSSI(struct adapter *pAdapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@@ -1582,10 +1565,6 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct
*pDM_Odm)
ODM_CmnInfoUpdate(pHalData-odmpriv , ODM_CMNINFO_RSSI_MIN,
pdmpriv-MinUndecoratedPWDBForDM);
}
-void odm_RSSIMonitorCheckAP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
void ODM_InitAllTimers(struct odm_dm_struct *pDM_Odm)
{
ODM_InitializeTimer(pDM_Odm,
pDM_Odm-DM_SWAT_Table.SwAntennaSwitchTimer,
@@ -1625,13 +1604,11 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct
*pDM_Odm)
/* HW dynamic mechanism. */
switch (pDM_Odm-SupportPlatform) {
caseODM_MP:
- odm_TXPowerTrackingCheckMP(pDM_Odm);
break;
caseODM_CE:
odm_TXPowerTrackingCheckCE(pDM_Odm);
break;
caseODM_AP:
- odm_TXPowerTrackingCheckAP(pDM_Odm);
break;
caseODM_ADSL:
break;
@@ -1656,14 +1633,6 @@ void odm_TXPowerTrackingCheckCE(struct odm_dm_struct
*pDM_Odm)
}
}
-void odm_TXPowerTrackingCheckMP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
-void odm_TXPowerTrackingCheckAP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
/* antenna mapping info */
/* 1: right-side antenna */
/* 2/0: left-side antenna */
@@ -1675,21 +1644,6 @@ void odm_TXPowerTrackingCheckAP(struct odm_dm_struct
*pDM_Odm)
/*
[PATCH 15/31] staging: r8188eu: Remove macro ODM_GetRFReg
This one is a duplicate od macro PHY_QueryRFReg.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c| 4 ++--
drivers/staging/rtl8188eu/hal/odm.c | 4 ++--
drivers/staging/rtl8188eu/hal/odm_interface.c | 6 --
drivers/staging/rtl8188eu/include/odm_interface.h | 3 ---
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
index 9552e4f..15e8e3f 100644
--- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
@@ -173,7 +173,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
(===dm_TXPowerTrackingCallback_ThermalMeter_8188E
txpowercontrol %d\n,
dm_odm-RFCalibrateInfo.TxPowerTrackControl));
- ThermalValue = (u8)ODM_GetRFReg(dm_odm, RF_PATH_A, RF_T_METER_88E,
0xfc00); /* 0x42: RF Reg[15:10] 88E */
+ ThermalValue = (u8)PHY_QueryRFReg(Adapter, RF_PATH_A, RF_T_METER_88E,
0xfc00); /* 0x42: RF Reg[15:10] 88E */
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
(Readback Thermal Meter = 0x%x pre thermal meter 0x%x
EEPROMthermalmeter 0x%x\n,
@@ -450,7 +450,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION,
ODM_DBG_LOUD,
(TxPwrTracking 0xc80 = 0x%x,
0xc94 = 0x%x RF 0x24 = 0x%x\n,
PHY_QueryBBReg(Adapter, 0xc80,
bMaskDWord), PHY_QueryBBReg(Adapter,
-0xc94, bMaskDWord),
ODM_GetRFReg(dm_odm, RF_PATH_A, 0x24, bRFRegOffsetMask)));
+0xc94, bMaskDWord),
PHY_QueryRFReg(Adapter, RF_PATH_A, 0x24, bRFRegOffsetMask)));
}
}
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index 00b0675..e146c39 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -1992,8 +1992,8 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct
*pDM_Odm, u8 mode)
/* 1 Backup Current RF/BB Settings */
- CurrentChannel = ODM_GetRFReg(pDM_Odm, RF_PATH_A, ODM_CHANNEL,
bRFRegOffsetMask);
- RfLoopReg = ODM_GetRFReg(pDM_Odm, RF_PATH_A, 0x00, bRFRegOffsetMask);
+ CurrentChannel = PHY_QueryRFReg(adapter, RF_PATH_A, ODM_CHANNEL,
bRFRegOffsetMask);
+ RfLoopReg = PHY_QueryRFReg(adapter, RF_PATH_A, 0x00, bRFRegOffsetMask);
PHY_SetBBReg(adapter, rFPGA0_XA_RFInterfaceOE, ODM_DPDT, Antenna_A);
/* change to Antenna A */
/* Step 1: USE IQK to transmitter single tone */
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index c2c1d55..0782bef 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -69,12 +69,6 @@ u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32
RegAddr, u32 BitMask)
return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
}
-u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH
eRFPath, u32 RegAddr, u32 BitMask)
-{
- struct adapter *Adapter = pDM_Odm-Adapter;
- return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr,
BitMask);
-}
-
/* ODM Memory relative API. */
void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)
{
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h
b/drivers/staging/rtl8188eu/include/odm_interface.h
index bc13b6a..e2d3e78 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -94,9 +94,6 @@ void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr,
u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
-u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath,
-u32 RegAddr, u32 BitMask);
-
/* Memory Relative Function. */
void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32
length);
void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void *pPtr, u32 length);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 21/31] staging: r8188eu: Simplify code concerning SupportPlatform
This member of struct odm_dm_struct is always set to ODM_CE in this driver.
As a result, a number of switch and if statements can be simplified. In
addition, a number of routines are no longer used and can be removed.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm.c | 128 +++
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 76
2 files changed, 31 insertions(+), 173 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index f73f3af..9606db5 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -522,9 +522,6 @@ void odm_CmnInfoHook_Debug(struct odm_dm_struct *pDM_Odm)
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD,
(pbScanInProcess=%d\n, *(pDM_Odm-pbScanInProcess)));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD,
(pbPowerSaving=%d\n, *(pDM_Odm-pbPowerSaving)));
-
- if (pDM_Odm-SupportPlatform (ODM_AP|ODM_ADSL))
- ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD,
(pOnePathCCA=%d\n, *(pDM_Odm-pOnePathCCA)));
}
void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm)
@@ -536,21 +533,6 @@ void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm)
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, (RSSI_Min=%d\n,
pDM_Odm-RSSI_Min));
}
-static int getIGIForDiff(int value_IGI)
-{
- #define ONERCCA_LOW_TH 0x30
- #define ONERCCA_LOW_DIFF8
-
- if (value_IGI ONERCCA_LOW_TH) {
- if ((ONERCCA_LOW_TH - value_IGI) ONERCCA_LOW_DIFF)
- return ONERCCA_LOW_TH;
- else
- return value_IGI + ONERCCA_LOW_DIFF;
- } else {
- return value_IGI;
- }
-}
-
void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)
{
struct rtw_dig *pDM_DigTable = pDM_Odm-DM_DigTable;
@@ -561,29 +543,9 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8
CurrentIGI)
ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm)));
if (pDM_DigTable-CurIGValue != CurrentIGI) {
- if (pDM_Odm-SupportPlatform (ODM_CE|ODM_MP)) {
- PHY_SetBBReg(adapter, ODM_REG(IGI_A, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- if (pDM_Odm-SupportICType != ODM_RTL8188E)
- PHY_SetBBReg(adapter, ODM_REG(IGI_B, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- } else if (pDM_Odm-SupportPlatform (ODM_AP|ODM_ADSL)) {
- switch (*(pDM_Odm-pOnePathCCA)) {
- case ODM_CCA_2R:
- PHY_SetBBReg(adapter, ODM_REG(IGI_A, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- if (pDM_Odm-SupportICType !=
ODM_RTL8188E)
- PHY_SetBBReg(adapter, ODM_REG(IGI_B,
pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- break;
- case ODM_CCA_1R_A:
- PHY_SetBBReg(adapter, ODM_REG(IGI_A, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- if (pDM_Odm-SupportICType !=
ODM_RTL8188E)
- PHY_SetBBReg(adapter, ODM_REG(IGI_B,
pDM_Odm), ODM_BIT(IGI, pDM_Odm), getIGIForDiff(CurrentIGI));
- break;
- case ODM_CCA_1R_B:
- PHY_SetBBReg(adapter, ODM_REG(IGI_A, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), getIGIForDiff(CurrentIGI));
- if (pDM_Odm-SupportICType !=
ODM_RTL8188E)
- PHY_SetBBReg(adapter, ODM_REG(IGI_B,
pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
- break;
- }
- }
+ PHY_SetBBReg(adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI,
pDM_Odm), CurrentIGI);
+ if (pDM_Odm-SupportICType != ODM_RTL8188E)
+ PHY_SetBBReg(adapter, ODM_REG(IGI_B, pDM_Odm),
ODM_BIT(IGI, pDM_Odm), CurrentIGI);
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,
(CurrentIGI(0x%02x).\n, CurrentIGI));
/* pDM_DigTable-PreIGValue = pDM_DigTable-CurIGValue; */
pDM_DigTable-CurIGValue = CurrentIGI;
@@ -734,24 +696,13 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
/* 1 Boundary Decision */
if ((pDM_Odm-SupportICType (ODM_RTL8192C|ODM_RTL8723A))
((pDM_Odm-BoardType == ODM_BOARD_HIGHPWR) || pDM_Odm-ExtLNA)) {
- if (pDM_Odm-SupportPlatform (ODM_AP|ODM_ADSL)) {
- dm_dig_max = DM_DIG_MAX_AP_HP;
- dm_dig_min = DM_DIG_MIN_AP_HP;
- } else {
- dm_dig_max = DM_DIG_MAX_NIC_HP;
-
[PATCH 14/31] staging: r8188eu: Remove macro ODM_SetRFReg
It is a duplicate of macro PHY_SetRFReg. Signed-off-by: Larry Finger larry.fin...@lwfinger.net --- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 32 +++--- drivers/staging/rtl8188eu/hal/odm.c| 8 +++--- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 6 ++-- drivers/staging/rtl8188eu/hal/odm_interface.c | 6 drivers/staging/rtl8188eu/include/odm_interface.h | 3 -- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c index 1dbe601..9552e4f 100644 --- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c @@ -534,14 +534,14 @@ phy_PathA_RxIQK(struct adapter *adapt, bool configPathB) /* modify RXIQK mode table */ ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (Path-A Rx IQK modify RXIQK mode table!\n)); PHY_SetBBReg(adapt, rFPGA0_IQK, bMaskDWord, 0x); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_WE_LUT, bRFRegOffsetMask, 0x800a0); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x3); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0xf); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xf117B); + PHY_SetRFReg(adapt, RF_PATH_A, RF_WE_LUT, bRFRegOffsetMask, 0x800a0); + PHY_SetRFReg(adapt, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x3); + PHY_SetRFReg(adapt, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0xf); + PHY_SetRFReg(adapt, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xf117B); /* PA,PAD off */ - ODM_SetRFReg(dm_odm, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0x980); - ODM_SetRFReg(dm_odm, RF_PATH_A, 0x56, bRFRegOffsetMask, 0x51000); + PHY_SetRFReg(adapt, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0x980); + PHY_SetRFReg(adapt, RF_PATH_A, 0x56, bRFRegOffsetMask, 0x51000); PHY_SetBBReg(adapt, rFPGA0_IQK, bMaskDWord, 0x8080); @@ -596,10 +596,10 @@ phy_PathA_RxIQK(struct adapter *adapt, bool configPathB) /* modify RXIQK mode table */ ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (Path-A Rx IQK modify RXIQK mode table 2!\n)); PHY_SetBBReg(adapt, rFPGA0_IQK, bMaskDWord, 0x); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_WE_LUT, bRFRegOffsetMask, 0x800a0); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x3); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0xf); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xf7ffa); + PHY_SetRFReg(adapt, RF_PATH_A, RF_WE_LUT, bRFRegOffsetMask, 0x800a0); + PHY_SetRFReg(adapt, RF_PATH_A, RF_RCK_OS, bRFRegOffsetMask, 0x3); + PHY_SetRFReg(adapt, RF_PATH_A, RF_TXPA_G1, bRFRegOffsetMask, 0xf); + PHY_SetRFReg(adapt, RF_PATH_A, RF_TXPA_G2, bRFRegOffsetMask, 0xf7ffa); PHY_SetBBReg(adapt, rFPGA0_IQK, bMaskDWord, 0x8080); /* IQK setting */ @@ -637,7 +637,7 @@ phy_PathA_RxIQK(struct adapter *adapt, bool configPathB) /* reload RF 0xdf */ PHY_SetBBReg(adapt, rFPGA0_IQK, bMaskDWord, 0x); - ODM_SetRFReg(dm_odm, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0x180); + PHY_SetRFReg(adapt, RF_PATH_A, 0xdf, bRFRegOffsetMask, 0x180); if (!(regeac BIT27) /* if Tx is OK, check whether Rx is OK */ (((regEA4 0x03FF)16) != 0x132) @@ -1245,18 +1245,18 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) /* 2. Set RF mode = standby mode */ /* Path-A */ - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_AC, bMask12Bits, (RF_Amode0x8)|0x1); + PHY_SetRFReg(adapt, RF_PATH_A, RF_AC, bMask12Bits, (RF_Amode0x8)|0x1); /* Path-B */ if (is2t) - ODM_SetRFReg(dm_odm, RF_PATH_B, RF_AC, bMask12Bits, (RF_Bmode0x8)|0x1); + PHY_SetRFReg(adapt, RF_PATH_B, RF_AC, bMask12Bits, (RF_Bmode0x8)|0x1); } /* 3. Read RF reg18 */ LC_Cal = PHY_QueryRFReg(adapt, RF_PATH_A, RF_CHNLBW, bMask12Bits); /* 4. Set LC calibration begin bit15 */ - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal|0x08000); + PHY_SetRFReg(adapt, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal|0x08000); msleep(100); @@ -1265,11 +1265,11 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) /* Deal with continuous TX case */ /* Path-A */ ODM_Write1Byte(dm_odm, 0xd03, tmpreg); - ODM_SetRFReg(dm_odm, RF_PATH_A, RF_AC, bMask12Bits, RF_Amode); + PHY_SetRFReg(adapt, RF_PATH_A, RF_AC, bMask12Bits, RF_Amode); /* Path-B */ if (is2t) - ODM_SetRFReg(dm_odm,
[PATCH 28/31] staging: r8188eu: Fix sparse warning in core/rtw_pwrctrl.c
Sparse reports the following:
CHECK drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c:525:6: warning: symbol
'rtw_free_pwrctrl_priv' was not declared. Should it be static?
That routine is not used and has been deleted.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index 4eec447..b5db22c 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -522,10 +522,6 @@ _func_enter_;
_func_exit_;
}
-void rtw_free_pwrctrl_priv(struct adapter *adapter)
-{
-}
-
u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func
efunc_id, u8 *val)
{
u8 bResult = true;
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 18/31] staging: r8188eu: Remove - number of dummy and unused routines
These routines include:
ODM_StartWorkItem()
ODM_StopWorkItem()
ODM_FreeWorkItem()
ODM_ScheduleWorkItem()
ODM_IsWorkItemScheduled()
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm_interface.c | 20
drivers/staging/rtl8188eu/include/odm_interface.h | 10 --
2 files changed, 30 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index e6b3543..74d37cf 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -90,26 +90,6 @@ void ODM_InitializeWorkItem(struct odm_dm_struct *pDM_Odm,
void *pRtWorkItem,
{
}
-void ODM_StartWorkItem(void *pRtWorkItem)
-{
-}
-
-void ODM_StopWorkItem(void *pRtWorkItem)
-{
-}
-
-void ODM_FreeWorkItem(void *pRtWorkItem)
-{
-}
-
-void ODM_ScheduleWorkItem(void *pRtWorkItem)
-{
-}
-
-void ODM_IsWorkItemScheduled(void *pRtWorkItem)
-{
-}
-
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay)
{
_set_timer(pTimer, msDelay); /* ms */
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h
b/drivers/staging/rtl8188eu/include/odm_interface.h
index 73110c8..f2e32a1 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -108,16 +108,6 @@ void ODM_InitializeWorkItem(struct odm_dm_struct *pDM_Odm,
void *pRtWorkItem,
RT_WORKITEM_CALL_BACK RtWorkItemCallback,
void *pContext, const char *szID);
-void ODM_StartWorkItem(void *pRtWorkItem);
-
-void ODM_StopWorkItem(void *pRtWorkItem);
-
-void ODM_FreeWorkItem(void *pRtWorkItem);
-
-void ODM_ScheduleWorkItem(void *pRtWorkItem);
-
-void ODM_IsWorkItemScheduled(void *pRtWorkItem);
-
/* ODM Timer relative API. */
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 19/31] staging: r8188eu: Remove more empty routines
This batch includes
ODM_StartWorkItem
ODM_StopWorkItem
ODM_FreeWorkItem
ODM_AcquireSpinLoc
ODM_ReleaseSpinLock
ODM_ReleaseTimer
ODM_ReleaseAllTimers
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm.c | 7 ---
drivers/staging/rtl8188eu/hal/odm_interface.c | 20
drivers/staging/rtl8188eu/include/odm.h | 2 --
drivers/staging/rtl8188eu/include/odm_interface.h | 14 --
4 files changed, 43 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index e146c39..683f2bc 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -1597,13 +1597,6 @@ void ODM_CancelAllTimers(struct odm_dm_struct *pDM_Odm)
ODM_CancelTimer(pDM_Odm, pDM_Odm-DM_SWAT_Table.SwAntennaSwitchTimer);
}
-void ODM_ReleaseAllTimers(struct odm_dm_struct *pDM_Odm)
-{
- ODM_ReleaseTimer(pDM_Odm, pDM_Odm-DM_SWAT_Table.SwAntennaSwitchTimer);
-
- ODM_ReleaseTimer(pDM_Odm, pDM_Odm-FastAntTrainingTimer);
-}
-
/* 3 */
/* 3 Tx Power Tracking */
/* 3 */
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index 74d37cf..3cd6821 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -74,22 +74,6 @@ s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void
*pBuf1, void *pBuf2, u
return _rtw_memcmp(pBuf1, pBuf2, length);
}
-/* ODM MISC relative API. */
-void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE
type)
-{
-}
-
-void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE
type)
-{
-}
-
-/* Work item relative API. FOr MP driver only~! */
-void ODM_InitializeWorkItem(struct odm_dm_struct *pDM_Odm, void *pRtWorkItem,
- RT_WORKITEM_CALL_BACK RtWorkItemCallback,
- void *pContext, const char *szID)
-{
-}
-
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay)
{
_set_timer(pTimer, msDelay); /* ms */
@@ -108,10 +92,6 @@ void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, struct
timer_list *pTimer)
_cancel_timer_ex(pTimer);
}
-void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer)
-{
-}
-
/* ODM FW relative API. */
u32 ODM_FillH2CCmd(u8 *pH2CBuffer, u32 H2CBufferLen, u32 CmdNum,
u32 *pElementID, u32 *pCmdLen,
diff --git a/drivers/staging/rtl8188eu/include/odm.h
b/drivers/staging/rtl8188eu/include/odm.h
index eaa4bc1..8934de9 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -1180,8 +1180,6 @@ void ODM_InitAllTimers(struct odm_dm_struct *pDM_Odm);
void ODM_CancelAllTimers(struct odm_dm_struct *pDM_Odm);
-void ODM_ReleaseAllTimers(struct odm_dm_struct *pDM_Odm);
-
void ODM_ResetIQKResult(struct odm_dm_struct *pDM_Odm);
void ODM_AntselStatistics_88C(struct odm_dm_struct *pDM_Odm, u8 MacId,
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h
b/drivers/staging/rtl8188eu/include/odm_interface.h
index f2e32a1..7cefb97 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -96,18 +96,6 @@ void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void
*pPtr, u32 length);
s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2,
u32 length);
-/* ODM MISC-spin lock relative API. */
-void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm,
-enum RT_SPINLOCK_TYPE type);
-
-void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm,
-enum RT_SPINLOCK_TYPE type);
-
-/* ODM MISC-workitem relative API. */
-void ODM_InitializeWorkItem(struct odm_dm_struct *pDM_Odm, void *pRtWorkItem,
- RT_WORKITEM_CALL_BACK RtWorkItemCallback,
- void *pContext, const char *szID);
-
/* ODM Timer relative API. */
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay);
@@ -118,8 +106,6 @@ void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm,
void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer);
-void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, struct timer_list
*pTimer);
-
/* ODM FW relative API. */
u32 ODM_FillH2CCmd(u8 *pH2CBuffer, u32 H2CBufferLen, u32 CmdNum,
u32 *pElementID, u32 *pCmdLen, u8 **pCmbBuffer,
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 17/31] staging: r8188eu: Remove macro ODM_GetMACReg
This is equivalent to PHY_GetBBReg.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 8
drivers/staging/rtl8188eu/hal/odm_interface.c | 6 --
drivers/staging/rtl8188eu/include/odm_interface.h | 2 --
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 1f0d3cf..fb80afe 100644
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -46,7 +46,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
(odm_RX_HWAntDivInit()\n));
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+ value32 = PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/*
Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
@@ -76,7 +76,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
(odm_TRX_HWAntDivInit()\n));
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+ value32 = PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/*
Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
@@ -125,9 +125,9 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct
*dm_odm)
dm_fat_tbl-FAT_State = FAT_NORMAL_STATE;
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
+ value32 = PHY_QueryBBReg(adapter, 0x4c, bMaskDWord);
PHY_SetBBReg(adapter, 0x4c, bMaskDWord, value32|(BIT23|BIT25)); /*
Reg4C[25]=1, Reg4C[23]=1 for pin output */
- value32 = ODM_GetMACReg(dm_odm, 0x7B4, bMaskDWord);
+ value32 = PHY_QueryBBReg(adapter, 0x7B4, bMaskDWord);
PHY_SetBBReg(adapter, 0x7b4, bMaskDWord, value32|(BIT16|BIT17)); /*
Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */
/* Match MAC ADDR */
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index 715becb..e6b3543 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -57,12 +57,6 @@ void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u32
RegAddr, u32 Data)
rtw_write32(Adapter, RegAddr, Data);
}
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)
-{
- struct adapter *Adapter = pDM_Odm-Adapter;
- return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
-}
-
/* ODM Memory relative API. */
void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)
{
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h
b/drivers/staging/rtl8188eu/include/odm_interface.h
index 073879a..73110c8 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -89,8 +89,6 @@ void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u32
RegAddr, u16 Data);
void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 Data);
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
-
/* Memory Relative Function. */
void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32
length);
void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void *pPtr, u32 length);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 29/31] staging: r8188eu: Fix sparse warning in core/rtw_xmit.c
Sparse reports the following warning: CHECK drivers/staging/rtl8188eu/core/rtw_xmit.c drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23: warning: incorrect type in initializer (different base types) drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23:expected unsigned short [usertype] *fctrl drivers/staging/rtl8188eu/core/rtw_xmit.c:809:23:got restricted __le16 *noident Signed-off-by: Larry Finger larry.fin...@lwfinger.net --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index 026645c..24182fb 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -806,7 +806,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat u8 qos_option = false; int res = _SUCCESS; - u16 *fctrl = pwlanhdr-frame_ctl; + __le16 *fctrl = pwlanhdr-frame_ctl; struct sta_info *psta; -- 1.8.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 13/31] staging: r8188eu: Remove macro ODM_GetBBReg
This one is a duplicate of PHY_QueryBBReg.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c| 68 +++
drivers/staging/rtl8188eu/hal/odm.c | 49
drivers/staging/rtl8188eu/hal/odm_interface.c | 6 --
drivers/staging/rtl8188eu/include/odm_interface.h | 2 -
4 files changed, 60 insertions(+), 65 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
index 1422118..1dbe601 100644
--- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
@@ -186,7 +186,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
if (ThermalValue) {
/* Query OFDM path A default setting */
- ele_D = ODM_GetBBReg(dm_odm, rOFDM0_XATxIQImbalance,
bMaskDWord)bMaskOFDM_D;
+ ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance,
bMaskDWord)bMaskOFDM_D;
for (i = 0; i OFDM_TABLE_SIZE_92D; i++) { /* find the
index */
if (ele_D == (OFDMSwingTable[i]bMaskOFDM_D)) {
OFDM_index_old[0] = (u8)i;
@@ -200,7 +200,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
/* Query OFDM path B default setting */
if (is2t) {
- ele_D = ODM_GetBBReg(dm_odm, rOFDM0_XBTxIQImbalance,
bMaskDWord)bMaskOFDM_D;
+ ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XBTxIQImbalance,
bMaskDWord)bMaskOFDM_D;
for (i = 0; i OFDM_TABLE_SIZE_92D; i++) { /* find
the index */
if (ele_D == (OFDMSwingTable[i]bMaskOFDM_D)) {
OFDM_index_old[1] = (u8)i;
@@ -449,7 +449,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION,
ODM_DBG_LOUD,
(TxPwrTracking 0xc80 = 0x%x,
0xc94 = 0x%x RF 0x24 = 0x%x\n,
-ODM_GetBBReg(dm_odm, 0xc80,
bMaskDWord), ODM_GetBBReg(dm_odm,
+PHY_QueryBBReg(Adapter, 0xc80,
bMaskDWord), PHY_QueryBBReg(Adapter,
0xc94, bMaskDWord),
ODM_GetRFReg(dm_odm, RF_PATH_A, 0x24, bRFRegOffsetMask)));
}
}
@@ -505,13 +505,13 @@ phy_PathA_IQK_8188E(struct adapter *adapt, bool
configPathB)
mdelay(IQK_DELAY_TIME_88E);
/* Check failed */
- regeac = ODM_GetBBReg(dm_odm, rRx_Power_After_IQK_A_2, bMaskDWord);
+ regeac = PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xeac =
0x%x\n, regeac));
- regE94 = ODM_GetBBReg(dm_odm, rTx_Power_Before_IQK_A, bMaskDWord);
+ regE94 = PHY_QueryBBReg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xe94 =
0x%x\n, regE94));
- regE9C = ODM_GetBBReg(dm_odm, rTx_Power_After_IQK_A, bMaskDWord);
+ regE9C = PHY_QueryBBReg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xe9c =
0x%x\n, regE9C));
- regEA4 = ODM_GetBBReg(dm_odm, rRx_Power_Before_IQK_A_2, bMaskDWord);
+ regEA4 = PHY_QueryBBReg(adapt, rRx_Power_Before_IQK_A_2, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xea4 =
0x%x\n, regEA4));
if (!(regeac BIT28)
@@ -571,13 +571,13 @@ phy_PathA_RxIQK(struct adapter *adapt, bool configPathB)
mdelay(IQK_DELAY_TIME_88E);
/* Check failed */
- regeac = ODM_GetBBReg(dm_odm, rRx_Power_After_IQK_A_2, bMaskDWord);
+ regeac = PHY_QueryBBReg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
(0xeac = 0x%x\n, regeac));
- regE94 = ODM_GetBBReg(dm_odm, rTx_Power_Before_IQK_A, bMaskDWord);
+ regE94 = PHY_QueryBBReg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
(0xe94 = 0x%x\n, regE94));
- regE9C = ODM_GetBBReg(dm_odm, rTx_Power_After_IQK_A, bMaskDWord);
+ regE9C = PHY_QueryBBReg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
(0xe9c = 0x%x\n, regE9C));
@@ -590,7 +590,7 @@ phy_PathA_RxIQK(struct adapter *adapt, bool configPathB)
u4tmp = 0x80007C00 | (regE940x3FF) | ((regE9C0x3FF) 16);
PHY_SetBBReg(adapt, rTx_IQK, bMaskDWord, u4tmp);
- ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, (0xe40 = 0x%x
u4tmp = 0x%x\n, ODM_GetBBReg(dm_odm, rTx_IQK, bMaskDWord), u4tmp));
+ ODM_RT_TRACE(dm_odm,
[PATCH 31/31] staging: r8188eu: Fix smatch error
Smatch shows the following: CHECK drivers/staging/rtl8188eu/core/rtw_mlme_ext.c drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1401 OnAssocReq() error: buffer overflow 'pstapriv-sta_aid' 32 = 32 Signed-off-by: Larry Finger larry.fin...@lwfinger.net --- drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c index 8ebe6bc..b1de6e7 100644 --- a/drivers/staging/rtl8188eu/core/rtw_ap.c +++ b/drivers/staging/rtl8188eu/core/rtw_ap.c @@ -279,7 +279,7 @@ voidexpire_timeout_chk(struct adapter *padapter) struct sta_info *psta = NULL; struct sta_priv *pstapriv = padapter-stapriv; u8 chk_alive_num = 0; - char chk_alive_list[NUM_STA]; + char chk_alive_list[NUM_STA + 1]; int i; spin_lock_bh(pstapriv-auth_list_lock); -- 1.8.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 26/31] staging: r8188eu: Eliminate enum ODM_RADIO_PATH in favor of rf_radio_path
There are two different enum statements that have been combined.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c | 4 +--
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 32 +++---
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 6 ++--
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c| 4 +--
drivers/staging/rtl8188eu/include/odm.h| 7 -
drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 +--
.../staging/rtl8188eu/include/odm_RegConfig8188E.h | 2 +-
7 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
index 480c810..17c6411 100644
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
@@ -211,7 +211,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct
odm_dm_struct *pDM_Odm)
else if (v1 == 0xf9)
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
else
- rtw_IOL_append_WRF_cmd(pxmit_frame,
ODM_RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
+ rtw_IOL_append_WRF_cmd(pxmit_frame,
RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
} else {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
}
@@ -247,7 +247,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct
odm_dm_struct *pDM_Odm)
else if (v1 == 0xf9)
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
else
-
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u16)v1, v2,
bRFRegOffsetMask);
+
rtw_IOL_append_WRF_cmd(pxmit_frame, RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
} else {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
}
diff --git a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index a452c7d..a755df3 100644
--- a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -106,8 +106,8 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct
odm_dm_struct *dm_odm,
isCCKrate = ((pPktinfo-Rate = DESC92C_RATE1M) (pPktinfo-Rate =
DESC92C_RATE11M)) ? true : false;
- pPhyInfo-RxMIMOSignalQuality[ODM_RF_PATH_A] = -1;
- pPhyInfo-RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
+ pPhyInfo-RxMIMOSignalQuality[RF_PATH_A] = -1;
+ pPhyInfo-RxMIMOSignalQuality[RF_PATH_B] = -1;
if (isCCKrate) {
u8 cck_agc_rpt;
@@ -190,15 +190,15 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct
odm_dm_struct *dm_odm,
SQ = ((64-SQ_rpt) * 100) / 44;
}
pPhyInfo-SignalQuality = SQ;
- pPhyInfo-RxMIMOSignalQuality[ODM_RF_PATH_A] = SQ;
- pPhyInfo-RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
+ pPhyInfo-RxMIMOSignalQuality[RF_PATH_A] = SQ;
+ pPhyInfo-RxMIMOSignalQuality[RF_PATH_B] = -1;
}
} else { /* is OFDM rate */
dm_odm-PhyDbgInfo.NumQryPhyStatusOFDM++;
/* (1)Get RSSI for HT rate */
-for (i = ODM_RF_PATH_A; i ODM_RF_PATH_MAX; i++) {
+for (i = RF_PATH_A; i RF_PATH_MAX; i++) {
/* 2008/01/30 MH we will judge RF RX path now. */
if (dm_odm-RFPathRxEnable BIT(i))
rf_rx_num++;
@@ -252,7 +252,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct
odm_dm_struct *dm_odm,
EVM =
odm_EVMdbToPercentage((pPhyStaRpt-stream_rxevm[i])); /* dbm */
if (pPktinfo-bPacketMatchBSSID) {
- if (i == ODM_RF_PATH_A) /* Fill value in RFD,
Get the first spatial stream only */
+ if (i == RF_PATH_A) /* Fill value in RFD, Get
the first spatial stream only */
pPhyInfo-SignalQuality = (u8)(EVM
0xff);
pPhyInfo-RxMIMOSignalQuality[i] = (u8)(EVM
0xff);
}
@@ -330,15 +330,15 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct
*dm_odm,
if (pPktinfo-bPacketToSelf || pPktinfo-bPacketBeacon) {
if (!isCCKrate) { /* ofdm rate */
- if
[PATCH 09/31] staging: r8188eu: Replace wrapper around sema_init
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +++---
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_xmit.c | 6 +++---
drivers/staging/rtl8188eu/include/osdep_service.h | 1 -
drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 2 +-
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 -
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
7 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index f01564f..a46aadd 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -38,9 +38,9 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
_func_enter_;
- _rtw_init_sema((pcmdpriv-cmd_queue_sema), 0);
- /* _rtw_init_sema((pcmdpriv-cmd_done_sema), 0); */
- _rtw_init_sema((pcmdpriv-terminate_cmdthread_sema), 0);
+ sema_init((pcmdpriv-cmd_queue_sema), 0);
+ /* sema_init((pcmdpriv-cmd_done_sema), 0); */
+ sema_init((pcmdpriv-terminate_cmdthread_sema), 0);
_rtw_init_queue((pcmdpriv-cmd_queue));
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c
b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 7c5403a..c9c1806 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -102,7 +102,7 @@ _func_enter_;
}
precvpriv-rx_pending_cnt = 1;
- _rtw_init_sema(precvpriv-allrxreturnevt, 0);
+ sema_init(precvpriv-allrxreturnevt, 0);
res = rtw_hal_init_recv_priv(padapter);
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 0ebcc7a..b372408 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -68,8 +68,8 @@ _func_enter_;
/* We don't need to memset padapter-XXX to zero, because adapter is
allocated by rtw_zvmalloc(). */
spin_lock_init(pxmitpriv-lock);
- _rtw_init_sema(pxmitpriv-xmit_sema, 0);
- _rtw_init_sema(pxmitpriv-terminate_xmitthread_sema, 0);
+ sema_init(pxmitpriv-xmit_sema, 0);
+ sema_init(pxmitpriv-terminate_xmitthread_sema, 0);
/*
Please insert all the queue initializaiton using _rtw_init_queue below
@@ -210,7 +210,7 @@ _func_enter_;
pxmitpriv-txirp_cnt = 1;
- _rtw_init_sema((pxmitpriv-tx_retevt), 0);
+ sema_init((pxmitpriv-tx_retevt), 0);
/* per AC pending irp */
pxmitpriv-beq_cnt = 0;
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index b36fc20..77829b9 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -256,7 +256,6 @@ void rtw_list_insert_head(struct list_head *plist, struct
list_head *phead);
void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);
void rtw_list_delete(struct list_head *plist);
-void _rtw_init_sema(struct semaphore *sema, int init_val);
void _rtw_free_sema(struct semaphore *sema);
void _rtw_up_sema(struct semaphore *sema);
u32 _rtw_down_sema(struct semaphore *sema);
diff --git a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
index d4b8acb..3946c03 100644
--- a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
@@ -99,7 +99,7 @@ struct reportpwrstate_parm {
static inline void _init_pwrlock(struct semaphore *plock)
{
- _rtw_init_sema(plock, 1);
+ sema_init(plock, 1);
}
static inline void _free_pwrlock(struct semaphore *plock)
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 77f5310..f292427 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -161,11 +161,6 @@ void rtw_list_insert_tail(struct list_head *plist, struct
list_head *phead)
Caller must check if the list is empty before calling rtw_list_delete
*/
-void _rtw_init_sema(struct semaphore *sema, int init_val)
-{
- sema_init(sema, init_val);
-}
-
void _rtw_free_sema(struct semaphore *sema)
{
}
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 28903aa..8642397 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -240,7 +240,7 @@ _func_enter_;
}
/* 3 misc */
- _rtw_init_sema((pdvobjpriv-usb_suspend_sema), 0);
+ sema_init((pdvobjpriv-usb_suspend_sema), 0);
rtw_reset_continual_urb_error(pdvobjpriv);
usb_get_dev(pusbd);
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
[PATCH 06/31] staging: r8188eu: Remove unused atomic_xxx wrappers
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/include/osdep_service.h | 7 -
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 35 ---
2 files changed, 42 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 7b2e87a..593d5a8 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -358,15 +358,8 @@ static inline u32 bitshift(u32 bitmask)
#define PATH_LENGTH_MAX PATH_MAX
/* Atomic integer operations */
-int ATOMIC_READ(atomic_t *v);
-void ATOMIC_ADD(atomic_t *v, int i);
-void ATOMIC_SUB(atomic_t *v, int i);
void ATOMIC_INC(atomic_t *v);
-void ATOMIC_DEC(atomic_t *v);
-int ATOMIC_ADD_RETURN(atomic_t *v, int i);
-int ATOMIC_SUB_RETURN(atomic_t *v, int i);
int ATOMIC_INC_RETURN(atomic_t *v);
-int ATOMIC_DEC_RETURN(atomic_t *v);
struct rtw_netdev_priv_indicator {
void *priv;
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 360703d..b699fe0 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -247,51 +247,16 @@ void rtw_sleep_schedulable(int ms)
#define RTW_SUSPEND_LOCK_NAME rtw_wifi
-inline int ATOMIC_READ(atomic_t *v)
-{
- return atomic_read(v);
-}
-
-inline void ATOMIC_ADD(atomic_t *v, int i)
-{
- atomic_add(i, v);
-}
-
-inline void ATOMIC_SUB(atomic_t *v, int i)
-{
- atomic_sub(i, v);
-}
-
inline void ATOMIC_INC(atomic_t *v)
{
atomic_inc(v);
}
-inline void ATOMIC_DEC(atomic_t *v)
-{
- atomic_dec(v);
-}
-
-inline int ATOMIC_ADD_RETURN(atomic_t *v, int i)
-{
- return atomic_add_return(i, v);
-}
-
-inline int ATOMIC_SUB_RETURN(atomic_t *v, int i)
-{
- return atomic_sub_return(i, v);
-}
-
inline int ATOMIC_INC_RETURN(atomic_t *v)
{
return atomic_inc_return(v);
}
-inline int ATOMIC_DEC_RETURN(atomic_t *v)
-{
- return atomic_dec_return(v);
-}
-
struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
void *old_priv)
{
--
1.8.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/31] staging: r8188eu: Remove macro ODM_SetMACReg
This is the same as macro PHY_SetBBReg.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 14 +++---
drivers/staging/rtl8188eu/hal/odm_interface.c | 6 --
drivers/staging/rtl8188eu/include/odm_interface.h | 3 ---
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 29c4780..1f0d3cf 100644
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -47,7 +47,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
/* MAC Setting */
value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
- ODM_SetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
+ PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/*
Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N, BIT10, 0); /*
Reg864[10]=1'b0 antsel2 by HW */
@@ -77,7 +77,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
/* MAC Setting */
value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
- ODM_SetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
+ PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord,
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/*
Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N, BIT10, 0); /*
Reg864[10]=1'b0 antsel2 by HW */
@@ -126,13 +126,13 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct
*dm_odm)
/* MAC Setting */
value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
- ODM_SetMACReg(dm_odm, 0x4c, bMaskDWord, value32|(BIT23|BIT25)); /*
Reg4C[25]=1, Reg4C[23]=1 for pin output */
+ PHY_SetBBReg(adapter, 0x4c, bMaskDWord, value32|(BIT23|BIT25)); /*
Reg4C[25]=1, Reg4C[23]=1 for pin output */
value32 = ODM_GetMACReg(dm_odm, 0x7B4, bMaskDWord);
- ODM_SetMACReg(dm_odm, 0x7b4, bMaskDWord, value32|(BIT16|BIT17)); /*
Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */
+ PHY_SetBBReg(adapter, 0x7b4, bMaskDWord, value32|(BIT16|BIT17)); /*
Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */
/* Match MAC ADDR */
- ODM_SetMACReg(dm_odm, 0x7b4, 0x, 0);
- ODM_SetMACReg(dm_odm, 0x7b0, bMaskDWord, 0);
+ PHY_SetBBReg(adapter, 0x7b4, 0x, 0);
+ PHY_SetBBReg(adapter, 0x7b0, bMaskDWord, 0);
PHY_SetBBReg(adapter, 0x870, BIT9|BIT8, 0);/* Reg870[8]=1'b0,
Reg870[9]=1'b0antsel antselb by HW */
PHY_SetBBReg(adapter, 0x864, BIT10, 0); /* Reg864[10]=1'b0 antsel2
by HW */
@@ -218,7 +218,7 @@ void ODM_UpdateRxIdleAnt_88E(struct odm_dm_struct *dm_odm,
u8 Ant)
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT5|BIT4|BIT3, DefaultAnt); /* Default RX */
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT8|BIT7|BIT6, OptionalAnt);/* Optional RX */
PHY_SetBBReg(adapter, ODM_REG_ANTSEL_CTRL_11N,
BIT14|BIT13|BIT12, DefaultAnt); /* Default TX */
- ODM_SetMACReg(dm_odm, ODM_REG_RESP_TX_11N, BIT6|BIT7,
DefaultAnt); /* Resp Tx */
+ PHY_SetBBReg(adapter, ODM_REG_RESP_TX_11N, BIT6|BIT7,
DefaultAnt); /* Resp Tx */
} else if (dm_odm-AntDivType == CGCS_RX_HW_ANTDIV) {
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT5|BIT4|BIT3, DefaultAnt); /* Default RX */
PHY_SetBBReg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT8|BIT7|BIT6, OptionalAnt);/* Optional RX */
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index 0782bef..715becb 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -57,12 +57,6 @@ void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u32
RegAddr, u32 Data)
rtw_write32(Adapter, RegAddr, Data);
}
-void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask,
u32 Data)
-{
- struct adapter *Adapter = pDM_Odm-Adapter;
- PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
-}
-
u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)
{
struct adapter *Adapter = pDM_Odm-Adapter;
diff
[PATCH 25/31] staging: r8188eu: Cleanup of include/hal_intf.h
This driver only handles RTL8188EU with USB interface, thus several hardware
defines and macros can be removed.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 --
drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 18 +++--
drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 1 -
drivers/staging/rtl8188eu/include/drv_types.h | 2 --
drivers/staging/rtl8188eu/include/hal_intf.h | 29 ---
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 -
6 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index 1e7c926..4c934e2 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -63,8 +63,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PLATFORM, ODM_CE);
- ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE,
Adapter-interface_type);/* RTL871X_HCI_TYPE */
-
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);
fab_ver = ODM_TSMC;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
index e5dc036..3d0e6c9 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
@@ -652,12 +652,10 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8
bStart)
/* Start Single Tone. */
RT_TRACE(_module_mp_, _drv_alert_, (SetSingleToneTx: test
start\n));
/* 20120326, Kordan To amplify the power of tone for Xtal
calibration. (asked by Edlu) */
- if (IS_HARDWARE_TYPE_8188E(pAdapter)) {
- reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A,
LNA_Low_Gain_3, bRFRegOffsetMask);
- reg58 = 0xFFF0;
- reg58 += 2;
- PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask, reg58);
- }
+ reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask);
+ reg58 = 0xFFF0;
+ reg58 += 2;
+ PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask, reg58);
PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x0);
PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x0);
@@ -687,11 +685,9 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8
bStart)
/* 20120326, Kordan To amplify the power of tone for Xtal
calibration. (asked by Edlu) */
/* 20120326, Kordan Only in single tone mode. (asked by
Edlu) */
- if (IS_HARDWARE_TYPE_8188E(pAdapter)) {
- reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A,
LNA_Low_Gain_3, bRFRegOffsetMask);
- reg58 = 0xFFF0;
- PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask, reg58);
- }
+ reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask);
+ reg58 = 0xFFF0;
+ PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3,
bRFRegOffsetMask, reg58);
write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x1);
write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
if (is92C) {
diff --git a/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
b/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
index 787763e..31ae21a 100644
--- a/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/hal/usb_ops_linux.c
@@ -723,6 +723,5 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)
void rtl8188eu_set_hw_type(struct adapter *adapt)
{
adapt-chip_type = RTL8188E;
- adapt-HardwareType = HARDWARE_TYPE_RTL8188EU;
DBG_88E(CHIP TYPE: RTL8188E\n);
}
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h
b/drivers/staging/rtl8188eu/include/drv_types.h
index 00a49ef..a492a1c 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -225,8 +225,6 @@ struct adapter {
int pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */
int bDongle;/* build-in module or external dongle */
u16 chip_type;
- u16 HardwareType;
- u16 interface_type;/* USB,SDIO,SPI,PCI */
struct dvobj_priv *dvobj;
struct mlme_priv mlmepriv;
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h
b/drivers/staging/rtl8188eu/include/hal_intf.h
index 439c3c9..c274b34 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -286,39 +286,10 @@ enum rt_eeprom_type {
#define RF_CHANGE_BY_SWBIT31
enum hardware_type {
- HARDWARE_TYPE_RTL8180,
- HARDWARE_TYPE_RTL8185,
-
[PATCH 23/31] staging: r8188eu: Remove unneeded prototypes from include/odm.h
This header contains a number of routines that do not to be available
globally. Once this change was made, a number of the routines were not
used, and could be removed.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm.c | 67 -
drivers/staging/rtl8188eu/include/odm.h | 49
2 files changed, 8 insertions(+), 108 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index 3ce881d..c73df3b 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -1348,17 +1348,6 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct
*pDM_Odm)
ODM_CmnInfoUpdate(pHalData-odmpriv , ODM_CMNINFO_RSSI_MIN,
pdmpriv-MinUndecoratedPWDBForDM);
}
-void ODM_InitAllTimers(struct odm_dm_struct *pDM_Odm)
-{
- ODM_InitializeTimer(pDM_Odm,
pDM_Odm-DM_SWAT_Table.SwAntennaSwitchTimer,
- (void *)odm_SwAntDivChkAntSwitchCallback, NULL,
SwAntennaSwitchTimer);
-}
-
-void ODM_CancelAllTimers(struct odm_dm_struct *pDM_Odm)
-{
- ODM_CancelTimer(pDM_Odm, pDM_Odm-DM_SWAT_Table.SwAntennaSwitchTimer);
-}
-
/* 3 */
/* 3 Tx Power Tracking */
/* 3 */
@@ -1436,27 +1425,6 @@ void odm_InitHybridAntDiv(struct odm_dm_struct *pDM_Odm)
ODM_AntennaDiversityInit_88E(pDM_Odm);
}
-void ODM_AntselStatistics_88C(struct odm_dm_struct *pDM_Odm, u8 MacId, u32
PWDBAll, bool isCCKrate)
-{
- struct sw_ant_switch *pDM_SWAT_Table = pDM_Odm-DM_SWAT_Table;
-
- if (pDM_SWAT_Table-antsel == 1) {
- if (isCCKrate) {
- pDM_SWAT_Table-CCK_Ant1_Cnt[MacId]++;
- } else {
- pDM_SWAT_Table-OFDM_Ant1_Cnt[MacId]++;
- pDM_SWAT_Table-RSSI_Ant1_Sum[MacId] += PWDBAll;
- }
- } else {
- if (isCCKrate) {
- pDM_SWAT_Table-CCK_Ant2_Cnt[MacId]++;
- } else {
- pDM_SWAT_Table-OFDM_Ant2_Cnt[MacId]++;
- pDM_SWAT_Table-RSSI_Ant2_Sum[MacId] += PWDBAll;
- }
- }
-}
-
void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm)
{
if (!(pDM_Odm-SupportAbility ODM_BB_ANT_DIV)) {
@@ -1569,30 +1537,6 @@ dm_CheckEdcaTurbo_EXIT:
precvpriv-last_rx_bytes = precvpriv-rx_bytes;
}
-/* need to ODM CE Platform */
-/* move to here for ANT detection mechanism using */
-
-u32 GetPSDData(struct odm_dm_struct *pDM_Odm, unsigned int point, u8
initial_gain_psd)
-{
- struct adapter *adapter = pDM_Odm-Adapter;
- u32 psd_report;
-
- /* Set DCO frequency index, offset=(40MHz/SamplePts)*point */
- PHY_SetBBReg(adapter, 0x808, 0x3FF, point);
-
- /* Start PSD calculation, Reg808[22]=0-1 */
- PHY_SetBBReg(adapter, 0x808, BIT22, 1);
- /* Need to wait for HW PSD report */
- udelay(30);
- PHY_SetBBReg(adapter, 0x808, BIT22, 0);
- /* Read PSD report, Reg8B4[15:0] */
- psd_report = PHY_QueryBBReg(adapter, 0x8B4, bMaskDWord) 0x;
-
- psd_report = (u32)
(ConvertTo_dB(psd_report))+(u32)(initial_gain_psd-0x1c);
-
- return psd_report;
-}
-
u32 ConvertTo_dB(u32 Value)
{
u8 i;
@@ -1617,14 +1561,3 @@ u32 ConvertTo_dB(u32 Value)
return dB;
}
-
-/* Description: */
-/* Set Single/Dual Antenna default setting for products that do not do
detection in advance. */
-/* Added by Joseph, 2012.03.22 */
-void ODM_SingleDualAntennaDefaultSetting(struct odm_dm_struct *pDM_Odm)
-{
- struct sw_ant_switch *pDM_SWAT_Table = pDM_Odm-DM_SWAT_Table;
-
- pDM_SWAT_Table-ANTA_ON = true;
- pDM_SWAT_Table-ANTB_ON = true;
-}
diff --git a/drivers/staging/rtl8188eu/include/odm.h
b/drivers/staging/rtl8188eu/include/odm.h
index db1d593..8e15847 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -1128,61 +1128,28 @@ extern u8 CCKSwingTable_Ch14 [CCK_TABLE_SIZE][8];
#define SWAW_STEP_PEAK 0
#define SWAW_STEP_DETERMINE1
-void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI);
-void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8
CurCCK_CCAThres);
-
-void ODM_SetAntenna(struct odm_dm_struct *pDM_Odm, u8 Antenna);
-
-
+#define dm_CheckTXPowerTracking ODM_TXPowerTrackingCheck
#define dm_RF_Saving ODM_RF_Saving
-void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal);
-
-#define SwAntDivRestAfterLink ODM_SwAntDivRestAfterLink
-void ODM_SwAntDivRestAfterLink(struct odm_dm_struct *pDM_Odm);
-#define dm_CheckTXPowerTracking ODM_TXPowerTrackingCheck
+void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal);
void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm);
-
+void odm_DIGbyRSSI_LPS(struct odm_dm_struct *pDM_Odm);
[PATCH 22/31] staging: r8188eu: Simplify code related to SupportICType
This member of struct odm_dm_struct is always set to ODM_RTL8188E for this
driver. Accordingly, the code can be simplified. A number of routines
now are no longer needed and are deleted.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
.../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 4 +-
drivers/staging/rtl8188eu/hal/odm.c| 615 -
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 218 +++-
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 +-
drivers/staging/rtl8188eu/include/odm.h| 2 -
drivers/staging/rtl8188eu/include/odm_debug.h | 13 +-
6 files changed, 191 insertions(+), 666 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
index aaa2617..3df33bc 100644
--- a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
+++ b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
@@ -529,9 +529,7 @@ ODM_RASupport_Init(
{
ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
(=ODM_RASupport_Init()\n));
- /* 2012/02/14 MH Be noticed, the init must be after IC type is
recognized! */
- if (dm_odm-SupportICType == ODM_RTL8188E)
- dm_odm-RaSupport88E = true;
+ dm_odm-RaSupport88E = true;
}
int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index 9606db5..3ce881d 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -182,20 +182,16 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
odm_DIGInit(pDM_Odm);
odm_RateAdaptiveMaskInit(pDM_Odm);
- if (pDM_Odm-SupportICType ODM_IC_11AC_SERIES) {
- ;
- } else if (pDM_Odm-SupportICType ODM_IC_11N_SERIES) {
- odm_PrimaryCCA_Init(pDM_Odm);/* Gary */
- odm_DynamicBBPowerSavingInit(pDM_Odm);
- odm_DynamicTxPowerInit(pDM_Odm);
- odm_TXPowerTrackingInit(pDM_Odm);
- ODM_EdcaTurboInit(pDM_Odm);
- ODM_RAInfo_Init_all(pDM_Odm);
- if ((pDM_Odm-AntDivType == CG_TRX_HW_ANTDIV) ||
- (pDM_Odm-AntDivType == CGCS_RX_HW_ANTDIV) ||
- (pDM_Odm-AntDivType == CG_TRX_SMART_ANTDIV))
- odm_InitHybridAntDiv(pDM_Odm);
- }
+ odm_PrimaryCCA_Init(pDM_Odm);/* Gary */
+ odm_DynamicBBPowerSavingInit(pDM_Odm);
+ odm_DynamicTxPowerInit(pDM_Odm);
+ odm_TXPowerTrackingInit(pDM_Odm);
+ ODM_EdcaTurboInit(pDM_Odm);
+ ODM_RAInfo_Init_all(pDM_Odm);
+ if ((pDM_Odm-AntDivType == CG_TRX_HW_ANTDIV) ||
+ (pDM_Odm-AntDivType == CGCS_RX_HW_ANTDIV) ||
+ (pDM_Odm-AntDivType == CG_TRX_SMART_ANTDIV))
+ odm_InitHybridAntDiv(pDM_Odm);
}
/* 2011/09/20 MH This is the entry pointer for all team to execute HW out
source DM. */
@@ -215,9 +211,7 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
/* NeilChen--2012--08--24-- */
/* Fix Leave LPS issue */
if ((pDM_Odm-Adapter-pwrctrlpriv.pwr_mode != PS_MODE_ACTIVE) /* in
LPS mode */
- ((pDM_Odm-SupportICType (ODM_RTL8723A)) ||
- (pDM_Odm-SupportICType (ODM_RTL8188E)
- ((pDM_Odm-SupportInterface == ODM_ITRF_SDIO) {
+ (pDM_Odm-SupportInterface == ODM_ITRF_SDIO)) {
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, (Step1:
odm_DIG is in LPS mode\n));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, (---Step2:
8723AS is in LPS mode\n));
odm_DIGbyRSSI_LPS(pDM_Odm);
@@ -238,13 +232,9 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
(pDM_Odm-AntDivType == CG_TRX_SMART_ANTDIV))
odm_HwAntDiv(pDM_Odm);
- if (pDM_Odm-SupportICType ODM_IC_11AC_SERIES) {
- ;
- } else if (pDM_Odm-SupportICType ODM_IC_11N_SERIES) {
- ODM_TXPowerTrackingCheck(pDM_Odm);
- odm_EdcaTurboCheck(pDM_Odm);
- odm_DynamicTxPower(pDM_Odm);
- }
+ ODM_TXPowerTrackingCheck(pDM_Odm);
+ odm_EdcaTurboCheck(pDM_Odm);
+ odm_DynamicTxPower(pDM_Odm);
}
/* Init /.. Fixed HW value. Only init time. */
@@ -455,10 +445,6 @@ void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm)
pDM_Odm-bCckHighPower = (bool) PHY_QueryBBReg(adapter, 0x824, BIT9);
pDM_Odm-RFPathRxEnable = (u8) PHY_QueryBBReg(adapter, 0xc04, 0x0F);
- if (pDM_Odm-SupportICType (ODM_RTL8192C|ODM_RTL8192D))
- pDM_Odm-AntDivType = CG_TRX_HW_ANTDIV;
- if (pDM_Odm-SupportICType (ODM_RTL8723A))
- pDM_Odm-AntDivType = CGCS_RX_SW_ANTDIV;
ODM_InitDebugSetting(pDM_Odm);
}
@@ -544,8 +530,6 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8
CurrentIGI)
if (pDM_DigTable-CurIGValue !=
[PATCH 10/31] staging: r8188eu: Remove wrappers _rtw_free_sema, _rtw_up_sema, and _rtw_mutex_init
Any routines that are empty as a result of these changes are also removed.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 11 ---
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 7 ---
drivers/staging/rtl8188eu/core/rtw_sreset.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 3 ---
drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 8 +---
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 +---
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 --
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 4 ++--
9 files changed, 10 insertions(+), 53 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index a46aadd..82fe8c4 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -121,9 +121,6 @@ void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
_func_enter_;
if (pcmdpriv) {
- _rtw_free_sema((pcmdpriv-cmd_queue_sema));
- _rtw_free_sema((pcmdpriv-terminate_cmdthread_sema));
-
if (pcmdpriv-cmd_allocated_buf)
kfree(pcmdpriv-cmd_allocated_buf);
@@ -257,7 +254,7 @@ _func_enter_;
res = _rtw_enqueue_cmd(pcmdpriv-cmd_queue, cmd_obj);
if (res == _SUCCESS)
- _rtw_up_sema(pcmdpriv-cmd_queue_sema);
+ up(pcmdpriv-cmd_queue_sema);
exit:
@@ -282,7 +279,7 @@ void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv)
{
_func_enter_;
pcmdpriv-cmd_done_cnt++;
- /* _rtw_up_sema((pcmdpriv-cmd_done_sema)); */
+ /* up((pcmdpriv-cmd_done_sema)); */
_func_exit_;
}
@@ -325,7 +322,7 @@ _func_enter_;
pcmdbuf = pcmdpriv-cmd_buf;
pcmdpriv-cmdthd_running = true;
- _rtw_up_sema(pcmdpriv-terminate_cmdthread_sema);
+ up(pcmdpriv-terminate_cmdthread_sema);
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (start r871x
rtw_cmd_thread \n));
@@ -411,7 +408,7 @@ post_process:
rtw_free_cmd_obj(pcmd);
} while (1);
- _rtw_up_sema(pcmdpriv-terminate_cmdthread_sema);
+ up(pcmdpriv-terminate_cmdthread_sema);
_func_exit_;
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index c011efe..4eec447 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -524,13 +524,6 @@ _func_exit_;
void rtw_free_pwrctrl_priv(struct adapter *adapter)
{
- struct pwrctrl_priv *pwrctrlpriv = adapter-pwrctrlpriv;
-
-_func_enter_;
-
- _free_pwrlock(pwrctrlpriv-lock);
-
-_func_exit_;
}
u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func
efunc_id, u8 *val)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c
b/drivers/staging/rtl8188eu/core/rtw_sreset.c
index 298f754..ee20d4a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sreset.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c
@@ -25,7 +25,7 @@ void sreset_init_value(struct adapter *padapter)
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = pHalData-srestpriv;
- _rtw_mutex_init(psrtpriv-silentreset_mutex);
+ mutex_init(psrtpriv-silentreset_mutex);
psrtpriv-silent_reset_inprogress = false;
psrtpriv-Wifi_Error_Status = WIFI_STATUS_SUCCESS;
psrtpriv-last_tx_time = 0;
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index b372408..b1af4ef 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -219,7 +219,7 @@ _func_enter_;
pxmitpriv-voq_cnt = 0;
pxmitpriv-ack_tx = false;
- _rtw_mutex_init(pxmitpriv-ack_tx_mutex);
+ mutex_init(pxmitpriv-ack_tx_mutex);
rtw_sctx_init(pxmitpriv-ack_tx_ops, 0);
rtw_hal_init_xmit_priv(padapter);
@@ -231,12 +231,6 @@ _func_exit_;
return res;
}
-static void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
-{
- _rtw_free_sema(pxmitpriv-xmit_sema);
- _rtw_free_sema(pxmitpriv-terminate_xmitthread_sema);
-}
-
void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
{
int i;
@@ -250,8 +244,6 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
rtw_hal_free_xmit_priv(padapter);
- rtw_mfree_xmit_priv_lock(pxmitpriv);
-
if (pxmitpriv-pxmit_frame_buf == NULL)
goto out;
diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h
b/drivers/staging/rtl8188eu/include/osdep_service.h
index 77829b9..3ea97fd 100644
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -256,10 +256,7 @@ void rtw_list_insert_head(struct list_head *plist, struct
[PATCH 24/31] staging: r8188eu: Additional cleanup of include/odm.h
This driver only works with the USB bus. Accordingly, enum odm_interface_def
can be removed along with all code that uses ODM_ITRF_XXX, where XXX is not USB.
In enum odm_ic_type, only ODM_RTL8188E is used. Remove the enum, all references
to the others, and define the needed value.
Signed-off-by: Larry Finger larry.fin...@lwfinger.net
---
drivers/staging/rtl8188eu/hal/odm.c | 12 +---
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 35 +++
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 5 +---
drivers/staging/rtl8188eu/include/odm.h | 24 +---
drivers/staging/rtl8188eu/include/odm_interface.h | 2 +-
5 files changed, 20 insertions(+), 58 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/odm.c
b/drivers/staging/rtl8188eu/hal/odm.c
index c73df3b..3555ffa 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -206,18 +206,8 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
odm_FalseAlarmCounterStatistics(pDM_Odm);
odm_RSSIMonitorCheck(pDM_Odm);
- /* For CE Platform(SPRD or Tablet) */
- /* 8723A or 8189ES platform */
- /* NeilChen--2012--08--24-- */
/* Fix Leave LPS issue */
- if ((pDM_Odm-Adapter-pwrctrlpriv.pwr_mode != PS_MODE_ACTIVE) /* in
LPS mode */
- (pDM_Odm-SupportInterface == ODM_ITRF_SDIO)) {
- ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, (Step1:
odm_DIG is in LPS mode\n));
- ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, (---Step2:
8723AS is in LPS mode\n));
- odm_DIGbyRSSI_LPS(pDM_Odm);
- } else {
- odm_DIG(pDM_Odm);
- }
+ odm_DIG(pDM_Odm);
odm_CCKPacketDetectionThresh(pDM_Odm);
if (*(pDM_Odm-pbPowerSaving))
diff --git a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index 42f07ce..a452c7d 100644
--- a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -43,25 +43,22 @@ static s32 odm_SignalScaleMapping_92CSeries(struct
odm_dm_struct *dm_odm, s32 Cu
{
s32 RetSig = 0;
- if ((dm_odm-SupportInterface == ODM_ITRF_USB) ||
- (dm_odm-SupportInterface == ODM_ITRF_SDIO)) {
- if (CurrSig = 51 CurrSig = 100)
- RetSig = 100;
- else if (CurrSig = 41 CurrSig = 50)
- RetSig = 80 + ((CurrSig - 40)*2);
- else if (CurrSig = 31 CurrSig = 40)
- RetSig = 66 + (CurrSig - 30);
- else if (CurrSig = 21 CurrSig = 30)
- RetSig = 54 + (CurrSig - 20);
- else if (CurrSig = 10 CurrSig = 20)
- RetSig = 42 + (((CurrSig - 10) * 2) / 3);
- else if (CurrSig = 5 CurrSig = 9)
- RetSig = 22 + (((CurrSig - 5) * 3) / 2);
- else if (CurrSig = 1 CurrSig = 4)
- RetSig = 6 + (((CurrSig - 1) * 3) / 2);
- else
- RetSig = CurrSig;
- }
+ if (CurrSig = 51 CurrSig = 100)
+ RetSig = 100;
+ else if (CurrSig = 41 CurrSig = 50)
+ RetSig = 80 + ((CurrSig - 40)*2);
+ else if (CurrSig = 31 CurrSig = 40)
+ RetSig = 66 + (CurrSig - 30);
+ else if (CurrSig = 21 CurrSig = 30)
+ RetSig = 54 + (CurrSig - 20);
+ else if (CurrSig = 10 CurrSig = 20)
+ RetSig = 42 + (((CurrSig - 10) * 2) / 3);
+ else if (CurrSig = 5 CurrSig = 9)
+ RetSig = 22 + (((CurrSig - 5) * 3) / 2);
+ else if (CurrSig = 1 CurrSig = 4)
+ RetSig = 6 + (((CurrSig - 1) * 3) / 2);
+ else
+ RetSig = CurrSig;
return RetSig;
}
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index ec0028d..1e7c926 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -63,10 +63,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PLATFORM, ODM_CE);
- if (Adapter-interface_type == RTW_GSPI)
- ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, ODM_ITRF_SDIO);
- else
- ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE,
Adapter-interface_type);/* RTL871X_HCI_TYPE */
+ ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE,
Adapter-interface_type);/* RTL871X_HCI_TYPE */
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);
diff --git a/drivers/staging/rtl8188eu/include/odm.h
b/drivers/staging/rtl8188eu/include/odm.h
index 8e15847..cc5d0b2 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -454,29 +454,7 @@ enum odm_ability_def {
ODM_RF_CALIBRATION = BIT26,
[PATCH 1/3] [staging] lustre: Fix space required before the open parenthesis in mgc_required.c
This patch fixed ERROR: space required before the open
parenthesis'(' found by checkpatch.pl in
lustre/lustre/mgc/mgc_request.c
Signed-off-by: Masanari Iida standby2...@gmail.com
---
drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c
b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index b323820..55a7e0c 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -70,7 +70,7 @@ static int mgc_name2resid(char *name, int len, struct
ldlm_res_id *res_id,
memset(res_id, 0, sizeof(*res_id));
res_id-name[0] = cpu_to_le64(resname);
/* XXX: unfortunately, sptlprc and config llog share one lock */
- switch(type) {
+ switch (type) {
case CONFIG_T_CONFIG:
case CONFIG_T_SPTLRPC:
resname = 0;
@@ -1800,7 +1800,7 @@ static int mgc_process_config(struct obd_device *obd,
obd_count len, void *buf)
char *logname;
int rc = 0;
- switch(lcfg-lcfg_command) {
+ switch (lcfg-lcfg_command) {
case LCFG_LOV_ADD_OBD: {
/* Overloading this cfg command: register a new target */
struct mgs_target_info *mti;
--
1.8.5.2.192.g7794a68
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: lustre: Fix do not use C99 // comments in mgc_request.c
This patch fixed ERROR: do not use C99 // comments
found by checkpatch.pl in lustre/lustre/mgc_request.c
Signed-off-by: Masanari Iida standby2...@gmail.com
---
drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c
b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index ede657e..3bdbb94 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1895,9 +1895,9 @@ struct obd_ops mgc_obd_ops = {
.o_del_conn = client_import_del_conn,
.o_connect = client_connect_import,
.o_disconnect = client_disconnect_export,
- //.o_enqueue = mgc_enqueue,
+ /* .o_enqueue = mgc_enqueue, */
.o_cancel = mgc_cancel,
- //.o_iocontrol= mgc_iocontrol,
+ /* .o_iocontrol= mgc_iocontrol, */
.o_set_info_async = mgc_set_info_async,
.o_get_info = mgc_get_info,
.o_import_event = mgc_import_event,
--
1.8.5.2.192.g7794a68
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: lustre: Fix brace {} are not necessary for single statement blocks
This patch fixed WARNING: braces {} are not necessary for
single statement blocks in lustre/lustre/mgc_request.c
Signed-off-by: Masanari Iida standby2...@gmail.com
---
drivers/staging/lustre/lustre/mgc/mgc_request.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c
b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 55a7e0c..ede657e 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1090,18 +1090,18 @@ int mgc_set_info_async(const struct lu_env *env, struct
obd_export *exp,
return -EINVAL;
rc = mgc_fs_setup(exp-exp_obd, sb);
- if (rc) {
+ if (rc)
CERROR(set_fs got %d\n, rc);
- }
+
return rc;
}
if (KEY_IS(KEY_CLEAR_FS)) {
if (vallen != 0)
return -EINVAL;
rc = mgc_fs_cleanup(exp-exp_obd);
- if (rc) {
+ if (rc)
CERROR(clear_fs got %d\n, rc);
- }
+
return rc;
}
if (KEY_IS(KEY_SET_INFO)) {
--
1.8.5.2.192.g7794a68
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/21] ozwpan: slight optimization of addr compare
Use the recently added and possibly more efficient
ether_addr_equal_unaligned to instead of memcmp.
Cc: Rupesh Gujare rupesh.guj...@atmel.com
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Cc: de...@driverdev.osuosl.org
Cc: linux-ker...@vger.kernel.org
Signed-off-by: Tan Xiaojun tanxiao...@huawei.com
Signed-off-by: Ding Tianhong dingtianh...@huawei.com
---
drivers/staging/ozwpan/ozcdev.c | 3 ++-
drivers/staging/ozwpan/ozproto.c | 6 --
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
index 6ce0af9..4a64262 100644
--- a/drivers/staging/ozwpan/ozcdev.c
+++ b/drivers/staging/ozwpan/ozcdev.c
@@ -448,7 +448,8 @@ int oz_cdev_start(struct oz_pd *pd, int resume)
}
spin_lock(g_cdev.lock);
if ((g_cdev.active_pd == NULL)
- (memcmp(pd-mac_addr, g_cdev.active_addr, ETH_ALEN) == 0)) {
+ (ether_addr_equal_unaligned(pd-mac_addr,
+ g_cdev.active_addr))) {
oz_pd_get(pd);
g_cdev.active_pd = pd;
oz_dbg(ON, Active PD arrived\n);
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c
index 88714ec..9a70591 100644
--- a/drivers/staging/ozwpan/ozproto.c
+++ b/drivers/staging/ozwpan/ozproto.c
@@ -9,6 +9,7 @@
#include linux/timer.h
#include linux/sched.h
#include linux/netdevice.h
+#include linux/etherdevice.h
#include linux/errno.h
#include linux/ieee80211.h
#include ozdbg.h
@@ -180,7 +181,8 @@ static struct oz_pd *oz_connect_req(struct oz_pd *cur_pd,
struct oz_elt *elt,
spin_lock_bh(g_polling_lock);
list_for_each(e, g_pd_list) {
pd2 = container_of(e, struct oz_pd, link);
- if (memcmp(pd2-mac_addr, pd_addr, ETH_ALEN) == 0) {
+ if (ether_addr_equal_unaligned(pd2-mac_addr,
+ pd_addr)) {
free_pd = pd;
pd = pd2;
break;
@@ -597,7 +599,7 @@ struct oz_pd *oz_pd_find(const u8 *mac_addr)
spin_lock_bh(g_polling_lock);
list_for_each(e, g_pd_list) {
pd = container_of(e, struct oz_pd, link);
- if (memcmp(pd-mac_addr, mac_addr, ETH_ALEN) == 0) {
+ if (ether_addr_equal_unaligned(pd-mac_addr, mac_addr)) {
atomic_inc(pd-ref_count);
spin_unlock_bh(g_polling_lock);
return pd;
--
1.8.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 0/2] fix sd power bug and modify phase-searching method
Hi, Is there anything wrong with this patch? It seems a long time, but I didn't got any reply. On 12/03/2013 10:34 AM, micky_ch...@realsil.com.cn wrote: From: Micky Ching micky_ch...@realsil.com.cn If the driver removed while sd card still in the slot, the card power will not power down correctly, if we insert the driver module again, UHS card will not switch to UHS mode. This bug is fix in this patch. We use another phase search method for tuning, which looks more simple, and reduce some source code. Micky Ching (2): mmc: rtsx: fix card poweroff bug mmc: rtsx: modify phase searching method for tuning drivers/mmc/host/rtsx_pci_sdmmc.c | 115 +++-- include/linux/mfd/rtsx_pci.h |2 +- 2 files changed, 35 insertions(+), 82 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
