beceem: get rid of unnecessary inline usage

[linux-2.6-microblaze.git] / drivers / staging / bcm / Misc.c

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index a5ce959..dfc4f3f 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -108,7 +108,7 @@ InitAdapter(PMINI_ADAPTER psAdapter)
 
 VOID AdapterFree(PMINI_ADAPTER Adapter)
 {
-       INT count = 0;
+       int count;
 
        beceem_protocol_reset(Adapter);
 
@@ -116,50 +116,51 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
 
        if(Adapter->control_packet_handler && !IS_ERR(Adapter->control_packet_handler))
                kthread_stop (Adapter->control_packet_handler);
+
        if(Adapter->transmit_packet_thread && !IS_ERR(Adapter->transmit_packet_thread))
-       kthread_stop (Adapter->transmit_packet_thread);
-    wake_up(&Adapter->process_read_wait_queue);
+               kthread_stop (Adapter->transmit_packet_thread);
+
+       wake_up(&Adapter->process_read_wait_queue);
+
        if(Adapter->LEDInfo.led_thread_running & (BCM_LED_THREAD_RUNNING_ACTIVELY | BCM_LED_THREAD_RUNNING_INACTIVELY))
                kthread_stop (Adapter->LEDInfo.led_cntrl_threadid);
-       bcm_unregister_networkdev(Adapter);
+
+       unregister_netdev(Adapter->dev);
+
+       /* FIXME: use proper wait_event and refcounting */
        while(atomic_read(&Adapter->ApplicationRunning))
        {
                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Waiting for Application to close.. %d\n",atomic_read(&Adapter->ApplicationRunning));
                msleep(100);
        }
        unregister_control_device_interface(Adapter);
-       if(Adapter->dev && !IS_ERR(Adapter->dev))
-               free_netdev(Adapter->dev);
-       if(Adapter->pstargetparams != NULL)
-       {
-               kfree(Adapter->pstargetparams);
-       }
+
+       kfree(Adapter->pstargetparams);
+
        for (count =0;count < MAX_CNTRL_PKTS;count++)
-       {
-               if(Adapter->txctlpacket[count])
-                       kfree(Adapter->txctlpacket[count]);
-       }
+               kfree(Adapter->txctlpacket[count]);
+
        FreeAdapterDsxBuffer(Adapter);
 
-       if(Adapter->pvInterfaceAdapter)
-               kfree(Adapter->pvInterfaceAdapter);
+       kfree(Adapter->pvInterfaceAdapter);
 
        //Free the PHS Interface
        PhsCleanup(&Adapter->stBCMPhsContext);
 
        BcmDeAllocFlashCSStructure(Adapter);
 
-       kfree(Adapter);
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "<========\n");
+       free_netdev(Adapter->dev);
 }
 
 
 int create_worker_threads(PMINI_ADAPTER psAdapter)
 {
+       const char *name = psAdapter->dev->name;
+
        BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Init Threads...");
        // Rx Control Packets Processing
        psAdapter->control_packet_handler = kthread_run((int (*)(void *))
-                       control_packet_handler, psAdapter, "CtrlPktHdlr");
+                                                       control_packet_handler, psAdapter, "%s-rx", name);
        if(IS_ERR(psAdapter->control_packet_handler))
        {
                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success\n");
@@ -167,7 +168,7 @@ int create_worker_threads(PMINI_ADAPTER psAdapter)
        }
        // Tx Thread
        psAdapter->transmit_packet_thread = kthread_run((int (*)(void *))
-               tx_pkt_handler, psAdapter, "TxPktThread");
+                                                       tx_pkt_handler, psAdapter, "%s-tx", name);
        if(IS_ERR (psAdapter->transmit_packet_thread))
        {
                BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success");
@@ -518,7 +519,7 @@ void SendLinkDown(PMINI_ADAPTER Adapter)
 *
 * Returns     - None.
 *******************************************************************/
-__inline VOID LinkMessage(PMINI_ADAPTER Adapter)
+VOID LinkMessage(PMINI_ADAPTER Adapter)
 {
        PLINK_REQUEST   pstLinkRequest=NULL;
        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
@@ -942,8 +943,7 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 
 }
 
-
-__inline int reset_card_proc(PMINI_ADAPTER ps_adapter)
+int reset_card_proc(PMINI_ADAPTER ps_adapter)
 {
        int retval = STATUS_SUCCESS;
 
@@ -1073,7 +1073,7 @@ err_exit :
        return retval;
 }
 
-__inline int run_card_proc(PMINI_ADAPTER ps_adapter )
+int run_card_proc(PMINI_ADAPTER ps_adapter )
 {
        unsigned int value=0;
        {