Staging: rt28x0: remove typedefs (part three)
Remove misc typedefs.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/rt2860/rtmp_timer.h b/drivers/staging/rt2860/rtmp_timer.h
index c81e507..28b8ac6 100644
--- a/drivers/staging/rt2860/rtmp_timer.h
+++ b/drivers/staging/rt2860/rtmp_timer.h
@@ -61,7 +61,7 @@
void *SystemSpecific3);
#endif /* RTMP_TIMER_TASK_SUPPORT // */
-typedef struct _RALINK_TIMER_STRUCT {
+struct rt_ralink_timer {
struct timer_list TimerObj; /* Ndis Timer object */
BOOLEAN Valid; /* Set to True when call RTMPInitTimer */
BOOLEAN State; /* True if timer cancelled */
@@ -73,32 +73,32 @@
RTMP_TIMER_TASK_HANDLE handle;
void *pAd;
#endif /* RTMP_TIMER_TASK_SUPPORT // */
-} RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT;
+};
#ifdef RTMP_TIMER_TASK_SUPPORT
-typedef struct _RTMP_TIMER_TASK_ENTRY_ {
- RALINK_TIMER_STRUCT *pRaTimer;
- struct _RTMP_TIMER_TASK_ENTRY_ *pNext;
-} RTMP_TIMER_TASK_ENTRY;
+struct rt_rtmp_timer_task_entry {
+ struct rt_ralink_timer *pRaTimer;
+ struct rt_rtmp_timer_task_entry *pNext;
+};
#define TIMER_QUEUE_SIZE_MAX 128
-typedef struct _RTMP_TIMER_TASK_QUEUE_ {
+struct rt_rtmp_timer_task_queue {
unsigned int status;
unsigned char *pTimerQPoll;
- RTMP_TIMER_TASK_ENTRY *pQPollFreeList;
- RTMP_TIMER_TASK_ENTRY *pQHead;
- RTMP_TIMER_TASK_ENTRY *pQTail;
-} RTMP_TIMER_TASK_QUEUE;
+ struct rt_rtmp_timer_task_entry *pQPollFreeList;
+ struct rt_rtmp_timer_task_entry *pQHead;
+ struct rt_rtmp_timer_task_entry *pQTail;
+};
#define BUILD_TIMER_FUNCTION(_func) \
void rtmp_timer_##_func(unsigned long data) \
{ \
- PRALINK_TIMER_STRUCT _pTimer = (PRALINK_TIMER_STRUCT)data; \
- RTMP_TIMER_TASK_ENTRY *_pQNode; \
- RTMP_ADAPTER *_pAd; \
+ struct rt_ralink_timer *_pTimer = (struct rt_ralink_timer *)data; \
+ struct rt_rtmp_timer_task_entry *_pQNode; \
+ struct rt_rtmp_adapter *_pAd; \
\
_pTimer->handle = _func; \
- _pAd = (RTMP_ADAPTER *)_pTimer->pAd; \
+ _pAd = (struct rt_rtmp_adapter *)_pTimer->pAd; \
_pQNode = RtmpTimerQInsert(_pAd, _pTimer); \
if ((_pQNode == NULL) && (_pAd->TimerQ.status & RTMP_TASK_CAN_DO_INSERT)) \
RTMP_OS_Add_Timer(&_pTimer->TimerObj, OS_HZ); \
@@ -107,7 +107,7 @@
#define BUILD_TIMER_FUNCTION(_func) \
void rtmp_timer_##_func(unsigned long data) \
{ \
- PRALINK_TIMER_STRUCT pTimer = (PRALINK_TIMER_STRUCT) data; \
+ struct rt_ralink_timer *pTimer = (struct rt_ralink_timer *)data; \
\
_func(NULL, (void *)pTimer->cookie, NULL, pTimer); \
if (pTimer->Repeat) \