Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: rt2860: fix coding style issue in rt_linux.c

Browse Source 
Signed-off-by: Gorskin Ilya <revent82@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Gorskin Ilya 2010-03-18 14:56:47 +05:00 committed by Greg Kroah-Hartman
parent 9fd453c981
commit cc9b5222f2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/staging/rt2860/rt_linux.c
View File

@ -82,7 +82,7 @@ char const *pWirelessFloodEventText[IW_FLOOD_EVENT_TYPE_NUM] = {
}; };
/* timeout -- ms */ /* timeout -- ms */
void RTMP_SetPeriodicTimer(struct timer_list * pTimer, void RTMP_SetPeriodicTimer(struct timer_list *pTimer,
IN unsigned long timeout) IN unsigned long timeout)
{ {
timeout = ((timeout * OS_HZ) / 1000); timeout = ((timeout * OS_HZ) / 1000);
@ -92,7 +92,7 @@ void RTMP_SetPeriodicTimer(struct timer_list * pTimer,
/* convert NdisMInitializeTimer --> RTMP_OS_Init_Timer */ /* convert NdisMInitializeTimer --> RTMP_OS_Init_Timer */
void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd, void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd,
struct timer_list * pTimer, struct timer_list *pTimer,
IN TIMER_FUNCTION function, void *data) IN TIMER_FUNCTION function, void *data)
{ {
init_timer(pTimer); init_timer(pTimer);
@ -100,7 +100,7 @@ void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd,
pTimer->function = function; pTimer->function = function;
} }
void RTMP_OS_Add_Timer(struct timer_list * pTimer, void RTMP_OS_Add_Timer(struct timer_list *pTimer,
IN unsigned long timeout) IN unsigned long timeout)
{ {
if (timer_pending(pTimer)) if (timer_pending(pTimer))
@ -111,14 +111,14 @@ void RTMP_OS_Add_Timer(struct timer_list * pTimer,
add_timer(pTimer); add_timer(pTimer);
} }
void RTMP_OS_Mod_Timer(struct timer_list * pTimer, void RTMP_OS_Mod_Timer(struct timer_list *pTimer,
IN unsigned long timeout) IN unsigned long timeout)
{ {
timeout = ((timeout * OS_HZ) / 1000); timeout = ((timeout * OS_HZ) / 1000);
mod_timer(pTimer, jiffies + timeout); mod_timer(pTimer, jiffies + timeout);
} }
void RTMP_OS_Del_Timer(struct timer_list * pTimer, void RTMP_OS_Del_Timer(struct timer_list *pTimer,
OUT BOOLEAN * pCancelled) OUT BOOLEAN * pCancelled)
{ {
if (timer_pending(pTimer)) { if (timer_pending(pTimer)) {
@ -146,7 +146,7 @@ void RTMPusecDelay(unsigned long usec)
udelay(usec % 50); udelay(usec % 50);
} }
void RTMP_GetCurrentSystemTime(LARGE_INTEGER * time) void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time)
{ {
time->u.LowPart = jiffies; time->u.LowPart = jiffies;
} }
@ -156,9 +156,9 @@ int os_alloc_mem(struct rt_rtmp_adapter *pAd, u8 ** mem, unsigned long size)
{ {
*mem = (u8 *)kmalloc(size, GFP_ATOMIC); *mem = (u8 *)kmalloc(size, GFP_ATOMIC);
if (*mem) if (*mem)
return (NDIS_STATUS_SUCCESS); return NDIS_STATUS_SUCCESS;
else else
return (NDIS_STATUS_FAILURE); return NDIS_STATUS_FAILURE;
} }
/* pAd MUST allow to be NULL */ /* pAd MUST allow to be NULL */
@ -167,7 +167,7 @@ int os_free_mem(struct rt_rtmp_adapter *pAd, void *mem)
ASSERT(mem); ASSERT(mem);
kfree(mem); kfree(mem);
return (NDIS_STATUS_SUCCESS); return NDIS_STATUS_SUCCESS;
} }
void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size) void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size)
@ -176,7 +176,7 @@ void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size)
/* Add 2 more bytes for ip header alignment */ /* Add 2 more bytes for ip header alignment */
skb = dev_alloc_skb(size + 2); skb = dev_alloc_skb(size + 2);
return ((void *)skb); return (void *)skb;
} }
void *RTMP_AllocateFragPacketBuffer(struct rt_rtmp_adapter *pAd, void *RTMP_AllocateFragPacketBuffer(struct rt_rtmp_adapter *pAd,
@ -201,7 +201,7 @@ void *RTMP_AllocateFragPacketBuffer(struct rt_rtmp_adapter *pAd,
void *RTMP_AllocateTxPacketBuffer(struct rt_rtmp_adapter *pAd, void *RTMP_AllocateTxPacketBuffer(struct rt_rtmp_adapter *pAd,
unsigned long Length, unsigned long Length,
IN BOOLEAN Cached, IN BOOLEAN Cached,
void ** VirtualAddress) void **VirtualAddress)
{ {
struct sk_buff *pkt; struct sk_buff *pkt;
@ -271,7 +271,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)
BOOLEAN OS_Need_Clone_Packet(void) BOOLEAN OS_Need_Clone_Packet(void)
{ {
return (FALSE); return FALSE;
} }
/* /*
@ -299,7 +299,7 @@ BOOLEAN OS_Need_Clone_Packet(void)
int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd, int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
IN BOOLEAN pInsAMSDUHdr, IN BOOLEAN pInsAMSDUHdr,
void *pInPacket, void *pInPacket,
void ** ppOutPacket) void **ppOutPacket)
{ {
struct sk_buff *pkt; struct sk_buff *pkt;
@ -328,7 +328,7 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
/* the allocated NDIS PACKET must be freed via RTMPFreeNdisPacket() */ /* the allocated NDIS PACKET must be freed via RTMPFreeNdisPacket() */
int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd, int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd,
void ** ppPacket, void **ppPacket,
u8 *pHeader, u8 *pHeader,
u32 HeaderLen, u32 HeaderLen,
u8 *pData, u32 DataLen) u8 *pData, u32 DataLen)
@ -391,7 +391,7 @@ int Sniff2BytesFromNdisBuffer(char *pFirstBuffer,
void RTMP_QueryPacketInfo(void *pPacket, void RTMP_QueryPacketInfo(void *pPacket,
struct rt_packet_info *pPacketInfo, struct rt_packet_info *pPacketInfo,
u8 ** pSrcBufVA, u32 * pSrcBufLen) u8 **pSrcBufVA, u32 * pSrcBufLen)
{ {
pPacketInfo->BufferCount = 1; pPacketInfo->BufferCount = 1;
pPacketInfo->pFirstBuffer = (char *)GET_OS_PKT_DATAPTR(pPacket); pPacketInfo->pFirstBuffer = (char *)GET_OS_PKT_DATAPTR(pPacket);
@ -402,9 +402,9 @@ void RTMP_QueryPacketInfo(void *pPacket,
*pSrcBufLen = GET_OS_PKT_LEN(pPacket); *pSrcBufLen = GET_OS_PKT_LEN(pPacket);
} }
void RTMP_QueryNextPacketInfo(void ** ppPacket, void RTMP_QueryNextPacketInfo(void **ppPacket,
struct rt_packet_info *pPacketInfo, struct rt_packet_info *pPacketInfo,
u8 ** pSrcBufVA, u32 * pSrcBufLen) u8 **pSrcBufVA, u32 * pSrcBufLen)
{ {
void *pPacket = NULL; void *pPacket = NULL;
@ -589,7 +589,7 @@ rt_get_sg_list_from_packet(void *pPacket, struct rt_rtmp_sg_list *sg)
sg->NumberOfElements = 1; sg->NumberOfElements = 1;
sg->Elements[0].Address = GET_OS_PKT_DATAPTR(pPacket); sg->Elements[0].Address = GET_OS_PKT_DATAPTR(pPacket);
sg->Elements[0].Length = GET_OS_PKT_LEN(pPacket); sg->Elements[0].Length = GET_OS_PKT_LEN(pPacket);
return (sg); return sg;
} }
void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen) void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen)
@ -1062,7 +1062,7 @@ void RtmpOSTaskCustomize(struct rt_rtmp_os_task *pTask)
#ifndef KTHREAD_SUPPORT #ifndef KTHREAD_SUPPORT
daemonize((char *)& pTask->taskName[0] /*"%s",pAd->net_dev->name */ ); daemonize((char *)&pTask->taskName[0] /*"%s",pAd->net_dev->name */);
allow_signal(SIGTERM); allow_signal(SIGTERM);
allow_signal(SIGKILL); allow_signal(SIGKILL);
@ -1247,7 +1247,7 @@ void RtmpOSNetDevFree(struct net_device *pNetDev)
free_netdev(pNetDev); free_netdev(pNetDev);
} }
int RtmpOSNetDevAlloc(struct net_device ** new_dev_p, u32 privDataSize) int RtmpOSNetDevAlloc(struct net_device **new_dev_p, u32 privDataSize)
{ {
/* assign it as null first. */ /* assign it as null first. */
*new_dev_p = NULL; *new_dev_p = NULL;
@ -1344,7 +1344,7 @@ struct net_device *RtmpOSNetDevCreate(struct rt_rtmp_adapter *pAd,
int status; int status;
/* allocate a new network device */ /* allocate a new network device */
status = RtmpOSNetDevAlloc(&pNetDev, 0 /*privMemSize */ ); status = RtmpOSNetDevAlloc(&pNetDev, 0 /*privMemSize */);
if (status != NDIS_STATUS_SUCCESS) { if (status != NDIS_STATUS_SUCCESS) {
/* allocation fail, exit */ /* allocation fail, exit */
DBGPRINT(RT_DEBUG_ERROR, DBGPRINT(RT_DEBUG_ERROR,