Prev: Perf doesn't accept i915:i915_gem_request_wait_begin as an event
Next: staging/pohmelfs: fix write_inode parameter warning
From: Ali Gündüz on 7 Mar 2010 09:40
Staging: rt2860: fix coding style issues in rt_linux.c
This is a patch to rt_linux.c that fixes various coding style issues
Signed-off-by: Ali Gündüz <gndz.ali(a)gmail.com>
diff --git a/drivers/staging/rt2860/rt_linux.c
b/drivers/staging/rt2860/rt_linux.c index 9357fb2..9afc7dd 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -80,7 +80,7 @@ char const
*pWirelessFloodEventText[IW_FLOOD_EVENT_TYPE_NUM] = { };

/* timeout -- ms */
-void RTMP_SetPeriodicTimer(struct timer_list * pTimer,
+void RTMP_SetPeriodicTimer(struct timer_list *pTimer,
IN unsigned long timeout)
{
timeout = ((timeout * OS_HZ) / 1000);
@@ -90,7 +90,7 @@ void RTMP_SetPeriodicTimer(struct timer_list * pTimer,

/* convert NdisMInitializeTimer --> RTMP_OS_Init_Timer */
void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd,
- struct timer_list * pTimer,
+ struct timer_list *pTimer,
IN TIMER_FUNCTION function, void *data)
{
init_timer(pTimer);
@@ -98,7 +98,7 @@ void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd,
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)
{
if (timer_pending(pTimer))
@@ -109,22 +109,20 @@ void RTMP_OS_Add_Timer(struct timer_list * 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)
{
timeout = ((timeout * OS_HZ) / 1000);
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)
{
- if (timer_pending(pTimer)) {
+ if (timer_pending(pTimer))
*pCancelled = del_timer_sync(pTimer);
- } else {
+ else
*pCancelled = TRUE;
- }
-
}

void RTMP_OS_Release_Packet(struct rt_rtmp_adapter *pAd, struct
rt_queue_entry *pEntry) @@ -144,7 +142,7 @@ void RTMPusecDelay(unsigned
long usec) udelay(usec % 50);
}

-void RTMP_GetCurrentSystemTime(LARGE_INTEGER * time)
+void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time)
{
time->u.LowPart = jiffies;
}
@@ -154,9 +152,9 @@ int os_alloc_mem(struct rt_rtmp_adapter *pAd, u8 **
mem, unsigned long size) {
*mem = (u8 *)kmalloc(size, GFP_ATOMIC);
if (*mem)
- return (NDIS_STATUS_SUCCESS);
+ return NDIS_STATUS_SUCCESS;
else
- return (NDIS_STATUS_FAILURE);
+ return NDIS_STATUS_FAILURE;
}

/* pAd MUST allow to be NULL */
@@ -165,7 +163,7 @@ int os_free_mem(struct rt_rtmp_adapter *pAd, void
*mem)
ASSERT(mem);
kfree(mem);
- return (NDIS_STATUS_SUCCESS);
+ return NDIS_STATUS_SUCCESS;
}

void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size)
@@ -189,9 +187,8 @@ void *RTMP_AllocateFragPacketBuffer(struct
rt_rtmp_adapter *pAd, ("can't allocate frag rx %ld size packet\n",
Length)); }

- if (pkt) {
+ if (pkt)
RTMP_SET_PACKET_SOURCE(OSPKT_TO_RTPKT(pkt),
PKTSRC_NDIS);
- }

return (void *)pkt;
}
@@ -199,7 +196,7 @@ void *RTMP_AllocateFragPacketBuffer(struct
rt_rtmp_adapter *pAd, void *RTMP_AllocateTxPacketBuffer(struct
rt_rtmp_adapter *pAd, unsigned long Length,
IN BOOLEAN Cached,
- void ** VirtualAddress)
+ void **VirtualAddress)
{
struct sk_buff *pkt;

@@ -267,7 +264,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)

BOOLEAN OS_Need_Clone_Packet(void)
{
- return (FALSE);
+ return FALSE;
}

/*
@@ -295,7 +292,7 @@ BOOLEAN OS_Need_Clone_Packet(void)
int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
IN BOOLEAN pInsAMSDUHdr,
void *pInPacket,
- void ** ppOutPacket)
+ void **ppOutPacket)
{

struct sk_buff *pkt;
@@ -306,9 +303,8 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
/* 1. Allocate a packet */
pkt = dev_alloc_skb(2048);

- if (pkt == NULL) {
+ if (pkt == NULL)
return NDIS_STATUS_FAILURE;
- }

skb_put(pkt, GET_OS_PKT_LEN(pInPacket));
NdisMoveMemory(pkt->data, GET_OS_PKT_DATAPTR(pInPacket),
@@ -324,7 +320,7 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,

/* the allocated NDIS PACKET must be freed via RTMPFreeNdisPacket() */
int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd,
- void ** ppPacket,
+ void **ppPacket,
u8 *pHeader,
u32 HeaderLen,
u8 *pData, u32 DataLen)
@@ -387,7 +383,7 @@ int Sniff2BytesFromNdisBuffer(char *pFirstBuffer,

void RTMP_QueryPacketInfo(void *pPacket,
struct rt_packet_info *pPacketInfo,
- u8 ** pSrcBufVA, u32 * pSrcBufLen)
+ u8 **pSrcBufVA, u32 * pSrcBufLen)
{
pPacketInfo->BufferCount = 1;
pPacketInfo->pFirstBuffer = (char
*)GET_OS_PKT_DATAPTR(pPacket); @@ -398,9 +394,9 @@ void
RTMP_QueryPacketInfo(void *pPacket, *pSrcBufLen =
GET_OS_PKT_LEN(pPacket); }

-void RTMP_QueryNextPacketInfo(void ** ppPacket,
+void RTMP_QueryNextPacketInfo(void **ppPacket,
struct rt_packet_info *pPacketInfo,
- u8 ** pSrcBufVA, u32 * pSrcBufLen)
+ u8 **pSrcBufVA, u32 * pSrcBufLen)
{
void *pPacket = NULL;

@@ -585,7 +581,7 @@ rt_get_sg_list_from_packet(void *pPacket, struct
rt_rtmp_sg_list *sg) sg->NumberOfElements = 1;
sg->Elements[0].Address = GET_OS_PKT_DATAPTR(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) @@ -784,11 +780,11 @@ void send_monitor_packets(struct
rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk) pRxBlk->pData +=
header_len; } /*end if */

- if (pRxBlk->DataSize < pOSPkt->len) {
+ if (pRxBlk->DataSize < pOSPkt->len)
skb_trim(pOSPkt, pRxBlk->DataSize);
- } else {
+ else
skb_put(pOSPkt, (pRxBlk->DataSize - pOSPkt->len));
- } /*end if */
+ /*end if */

if ((pRxBlk->pData - pOSPkt->data) > 0) {
skb_put(pOSPkt, (pRxBlk->pData - pOSPkt->data));
@@ -1243,7 +1239,7 @@ void RtmpOSNetDevFree(struct net_device *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. */
*new_dev_p = NULL;
@@ -1308,9 +1304,8 @@ int RtmpOSNetDevAttach(struct net_device *pNetDev,
/* OS specific flags, here we used to indicate if we
are virtual interface */ pNetDev->priv_flags = pDevOpHook->priv_flags;

- if (pAd->OpMode == OPMODE_STA) {
+ if (pAd->OpMode == OPMODE_STA)
pNetDev->wireless_handlers =
&rt28xx_iw_handler_def;
- }

/* copy the net device mac address to the net_device
structure. */ NdisMoveMemory(pNetDev->dev_addr,
&pDevOpHook->devAddr[0],
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: Perf doesn't accept i915:i915_gem_request_wait_begin as an event
Next: staging/pohmelfs: fix write_inode parameter warning