Commit ced2a007 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt3070: remove kernel version compatibility wrappers 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8179af30

drivers/staging/rt3070/2870_main_dev.c

+0 −139
Original line number Diff line number Diff line
@@ -83,26 +83,6 @@ MODULE_DEVICE_TABLE(usb, rtusb_usb_id); 
#endif





#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)



/**************************************************************************/

/**************************************************************************/

//tested for kernel 2.4 series

/**************************************************************************/

/**************************************************************************/

static void *rtusb_probe(struct usb_device *dev, UINT interface,

						const struct usb_device_id *id_table);

static void rtusb_disconnect(struct usb_device *dev, void *ptr);



struct usb_driver rtusb_driver = {

		name:"rt2870",

		probe:rtusb_probe,

		disconnect:rtusb_disconnect,

		id_table:rtusb_usb_id,

	};



#else



#ifdef CONFIG_PM

static int rt2870_suspend(struct usb_interface *intf, pm_message_t state);

static int rt2870_resume(struct usb_interface *intf);
@@ -118,9 +98,6 @@ static int rtusb_probe (struct usb_interface *intf, 
static void rtusb_disconnect(struct usb_interface *intf);



struct usb_driver rtusb_driver = {

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)

	.owner = THIS_MODULE,

#endif

	.name="rt2870",

	.probe=rtusb_probe,

	.disconnect=rtusb_disconnect,
@@ -182,7 +159,6 @@ static int rt2870_resume( 
	return 0;

}

#endif // CONFIG_PM //

#endif // LINUX_VERSION_CODE //





// Init driver module
@@ -811,14 +787,7 @@ static void _rtusb_disconnect(struct usb_device *dev, PRTMP_ADAPTER pAd) 
			MC_CardUsed[pAd->MC_RowID] = 0; // not clear MAC address

#endif // MULTIPLE_CARD_SUPPORT //



#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

		while(MOD_IN_USE > 0)

		{

			MOD_DEC_USE_COUNT;

		}

#else

		usb_put_dev(dev);

#endif // LINUX_VERSION_CODE //



		printk("rtusb_disconnect: pAd == NULL!\n");

		return;
@@ -840,31 +809,17 @@ static void _rtusb_disconnect(struct usb_device *dev, PRTMP_ADAPTER pAd) 
		unregister_netdev (pAd->net_dev);

	}

	udelay(1);

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

#else

	flush_scheduled_work();

#endif // LINUX_VERSION_CODE //

	udelay(1);



	// free net_device memory

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

	kfree(net_dev);

#else

	free_netdev(net_dev);

#endif // LINUX_VERSION_CODE //



	// free adapter memory

	RTMPFreeAdapter(pAd);



	// release a use of the usb device structure

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

	while(MOD_IN_USE > 0)

	{

		MOD_DEC_USE_COUNT;

	}

#else

	usb_put_dev(dev);

#endif // LINUX_VERSION_CODE //

	udelay(1);



	DBGPRINT(RT_DEBUG_ERROR, (" RTUSB disconnect successfully\n"));
@@ -887,22 +842,6 @@ Return Value: 
Note:

========================================================================

*/

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

static void *rtusb_probe(struct usb_device *dev, UINT interface,

						const struct usb_device_id *id)

{

	PRTMP_ADAPTER pAd;

	rt28xx_probe((void *)dev, (void *)id, interface, &pAd);

	return (void *)pAd;

}



//Disconnect function is called within exit routine

static void rtusb_disconnect(struct usb_device *dev, void *ptr)

{

	_rtusb_disconnect(dev, ((PRTMP_ADAPTER)ptr));

}



#else	/* kernel 2.6 series */

static int rtusb_probe (struct usb_interface *intf,

						const struct usb_device_id *id)

{
@@ -922,7 +861,6 @@ static void rtusb_disconnect(struct usb_interface *intf) 


	_rtusb_disconnect(dev, pAd);

}

#endif // LINUX_VERSION_CODE //





/*
@@ -1062,12 +1000,8 @@ Return Value: 
BOOLEAN RT28XXChipsetCheck(

	IN void *_dev_p)

{

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

	struct usb_device *dev_p = (struct usb_device *)_dev_p;

#else

	struct usb_interface *intf = (struct usb_interface *)_dev_p;

	struct usb_device *dev_p = interface_to_usbdev(intf);

#endif // LINUX_VERSION_CODE //

	UINT32 i;
@@ -1114,19 +1048,11 @@ BOOLEAN RT28XXNetDevInit( 
	IN struct  net_device	*net_dev,

	IN RTMP_ADAPTER 		*pAd)

{

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

	struct usb_device *dev_p = (struct usb_device *)_dev_p;

#else

	struct usb_interface *intf = (struct usb_interface *)_dev_p;

	struct usb_device *dev_p = interface_to_usbdev(intf);

#endif // LINUX_VERSION_CODE //





#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	/* kernel 2.4 series */

	pAd->config = dev_p->config;

#else

	pAd->config = &dev_p->config->desc;

#endif // LINUX_VERSION_CODE //

	return TRUE;

}
@@ -1147,70 +1073,6 @@ Return Value: 
Note:

========================================================================

*/

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

BOOLEAN RT28XXProbePostConfig(

	IN void 				*_dev_p,

	IN RTMP_ADAPTER 		*pAd,

	IN INT32				interface)

{

	struct usb_device *dev_p = (struct usb_device *)_dev_p;

	struct usb_interface *intf;

	struct usb_interface_descriptor *iface_desc;

	struct usb_endpoint_descriptor *endpoint;

	ULONG BulkOutIdx;

	UINT32 i;





	/* get the active interface descriptor */

	intf = &dev_p->actconfig->interface[interface];

	iface_desc = &intf->altsetting[0];



	/* get # of enpoints */

	pAd->NumberOfPipes = iface_desc->bNumEndpoints;

	DBGPRINT(RT_DEBUG_TRACE, ("NumEndpoints=%d\n", iface_desc->bNumEndpoints));



	/* Configure Pipes */

	endpoint = &iface_desc->endpoint[0];

	BulkOutIdx = 0;



	for(i=0; i<pAd->NumberOfPipes; i++)

	{

		if ((endpoint[i].bmAttributes == USB_ENDPOINT_XFER_BULK) &&

			((endpoint[i].bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN))

		{

			pAd->BulkInEpAddr = endpoint[i].bEndpointAddress;

			pAd->BulkInMaxPacketSize = endpoint[i].wMaxPacketSize;



			DBGPRINT_RAW(RT_DEBUG_TRACE,

				("BULK IN MaximumPacketSize = %d\n", pAd->BulkInMaxPacketSize));

			DBGPRINT_RAW(RT_DEBUG_TRACE,

				("EP address = 0x%2x  \n", endpoint[i].bEndpointAddress));

		}

		else if ((endpoint[i].bmAttributes == USB_ENDPOINT_XFER_BULK) &&

				((endpoint[i].bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT))

		{

			// There are 6 bulk out EP. EP6 highest priority.

			// EP1-4 is EDCA.  EP5 is HCCA.

			pAd->BulkOutEpAddr[BulkOutIdx++] = endpoint[i].bEndpointAddress;

			pAd->BulkOutMaxPacketSize = endpoint[i].wMaxPacketSize;



			DBGPRINT_RAW(RT_DEBUG_TRACE,

				("BULK OUT MaximumPacketSize = %d\n", pAd->BulkOutMaxPacketSize));

			DBGPRINT_RAW(RT_DEBUG_TRACE,

				("EP address = 0x%2x  \n", endpoint[i].bEndpointAddress));

		}

	}



	if (!(pAd->BulkInEpAddr && pAd->BulkOutEpAddr[0]))

	{

		printk("Could not find both bulk-in and bulk-out endpoints\n");

		return FALSE;

	}



	return TRUE;

}



#else

BOOLEAN RT28XXProbePostConfig(

	IN void 				*_dev_p,

	IN RTMP_ADAPTER 		*pAd,
@@ -1273,7 +1135,6 @@ BOOLEAN RT28XXProbePostConfig( 


	return TRUE;

}

#endif // LINUX_VERSION_CODE //





/*

drivers/staging/rt3070/common/rtusb_bulk.c

+0 −12
Original line number Diff line number Diff line
@@ -52,11 +52,7 @@ void RTUSB_FILL_BULK_URB (struct urb *pUrb, 
	void *pContext)

{



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	usb_fill_bulk_urb(pUrb, pUsb_Dev, bulkpipe, pTransferBuf, BufSize, (usb_complete_t)Complete, pContext);

#else

	FILL_BULK_URB(pUrb, pUsb_Dev, bulkpipe, pTransferBuf, BufSize, Complete, pContext);

#endif



}
@@ -95,14 +91,12 @@ VOID RTUSBInitTxDesc( 
						Func,

						pTxContext);



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	if (pTxContext->bAggregatible)

		pUrb->transfer_dma	= (pTxContext->data_dma + TX_BUFFER_NORMSIZE + 2);

	else

		pUrb->transfer_dma	= pTxContext->data_dma;



	pUrb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

#endif



}
@@ -135,10 +129,8 @@ VOID RTUSBInitHTTxDesc( 
						Func,

						pTxContext);



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	pUrb->transfer_dma	= (pTxContext->data_dma + pTxContext->NextBulkOutPosition);

	pUrb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

#endif



}
@@ -168,10 +160,8 @@ VOID RTUSBInitRxDesc( 
						(usb_complete_t)RTUSBBulkRxComplete,

						(void *)pRxContext);



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	pUrb->transfer_dma	= pRxContext->data_dma + pAd->NextRxBulkInPosition;

	pUrb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

#endif





}
@@ -744,11 +734,9 @@ VOID RTUSBBulkOutMLMEPacket( 
	// Init Tx context descriptor

	RTUSBInitTxDesc(pAd, pMLMEContext, MGMTPIPEIDX, (usb_complete_t)RTUSBBulkOutMLMEPacketComplete);



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	//For mgmt urb buffer, because we use sk_buff, so we need to notify the USB controller do dma mapping.

	pUrb->transfer_dma	= 0;

	pUrb->transfer_flags &= (~URB_NO_TRANSFER_DMA_MAP);

#endif



	pUrb = pMLMEContext->pUrb;

	if((ret = RTUSB_SUBMIT_URB(pUrb))!=0)

drivers/staging/rt3070/rt2870.h

+0 −24
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


/* rtmp_def.h */

//

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

#define BULKAGGRE_ZISE          100

#define RT28XX_DRVDATA_SET(_a)                                             usb_set_intfdata(_a, pAd);

#define RT28XX_PUT_DEVICE                                                  usb_put_dev
@@ -41,15 +40,6 @@ 
#define RTUSB_SUBMIT_URB(pUrb)                                             usb_submit_urb(pUrb, GFP_ATOMIC)

#define	RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr)               usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)

#define	RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)   usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)

#else

#define BULKAGGRE_ZISE          60

#define RT28XX_DRVDATA_SET(_a)

#define RT28XX_PUT_DEVICE(dev_p)

#define RTUSB_ALLOC_URB(iso)                                               usb_alloc_urb(iso)

#define RTUSB_SUBMIT_URB(pUrb)                                             usb_submit_urb(pUrb)

#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr)               kmalloc(BufSize, GFP_ATOMIC)

#define	RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)   kfree(pTransferBuf)

#endif



#define RXBULKAGGRE_ZISE        12

#define MAX_TXBULK_LIMIT        (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1))
@@ -542,23 +532,9 @@ typedef struct usb_ctrlrequest devctrlrequest; 
#define UNLINK_TIMEOUT_MS		3



/* unlink urb	*/

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)

#define RTUSB_UNLINK_URB(pUrb)		usb_kill_urb(pUrb)

#else

#define RTUSB_UNLINK_URB(pUrb)		usb_unlink_urb(pUrb)

#endif



// Prototypes of completion funuc.

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

#define RTUSBBulkOutDataPacketComplete(purb, pt_regs)    RTUSBBulkOutDataPacketComplete(purb)

#define RTUSBBulkOutMLMEPacketComplete(pUrb, pt_regs)    RTUSBBulkOutMLMEPacketComplete(pUrb)

#define RTUSBBulkOutNullFrameComplete(pUrb, pt_regs)     RTUSBBulkOutNullFrameComplete(pUrb)

#define RTUSBBulkOutRTSFrameComplete(pUrb, pt_regs)      RTUSBBulkOutRTSFrameComplete(pUrb)

#define RTUSBBulkOutPsPollComplete(pUrb, pt_regs)        RTUSBBulkOutPsPollComplete(pUrb)

#define RTUSBBulkRxComplete(pUrb, pt_regs)               RTUSBBulkRxComplete(pUrb)

#endif





VOID RTUSBBulkOutDataPacketComplete(purbb_t purb, struct pt_regs *pt_regs);

VOID RTUSBBulkOutMLMEPacketComplete(purbb_t pUrb, struct pt_regs *pt_regs);

VOID RTUSBBulkOutNullFrameComplete(purbb_t pUrb, struct pt_regs *pt_regs);

drivers/staging/rt3070/rt_ate.h

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ do{ int (*org_remote_display)(char *) = NULL; \ 
			RTMP_IRQ_UNLOCK((pLock), IrqFlags);



// Prototypes of completion funuc.

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

#define ATE_RTUSBBulkOutDataPacketComplete(purb, pt_regs)    ATE_RTUSBBulkOutDataPacketComplete(purb)

#endif



VOID ATE_RTUSBBulkOutDataPacketComplete(

	IN purbb_t purb,

	OUT struct pt_regs *pt_regs);

drivers/staging/rt3070/rt_linux.c

+1 −22
Original line number Diff line number Diff line
@@ -1014,35 +1014,14 @@ void send_monitor_packets( 


void rtmp_os_thread_init(PUCHAR pThreadName, PVOID pNotify)

{



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

	daemonize(pThreadName /*"%s",pAd->net_dev->name*/);



	allow_signal(SIGTERM);

	allow_signal(SIGKILL);

	current->flags |= PF_NOFREEZE;

#else

	unsigned long flags;



	daemonize();

	reparent_to_init();

	strcpy(current->comm, pThreadName);



	siginitsetinv(&current->blocked, sigmask(SIGTERM) | sigmask(SIGKILL));



	/* Allow interception of SIGKILL only

	 * Don't allow other signals to interrupt the transmission */

#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)

	spin_lock_irqsave(&current->sigmask_lock, flags);

	flush_signals(current);

	recalc_sigpending(current);

	spin_unlock_irqrestore(&current->sigmask_lock, flags);

#endif

#endif



	/* signal that we've started the thread */

	complete(pNotify);



}



void RTMP_IndicateMediaState(