diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 13:44:36 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:10 -0800 |
commit | da3e89082d8d3018b63589e435defd6bd9feb0f5 (patch) | |
tree | 586a3c5d89579870b3c76ef0d556e9200457fa67 /drivers/staging/otus/wwrap.c | |
parent | 4bd43f507c7e2f225f58235226a8381fd6bbff1a (diff) | |
download | op-kernel-dev-da3e89082d8d3018b63589e435defd6bd9feb0f5.zip op-kernel-dev-da3e89082d8d3018b63589e435defd6bd9feb0f5.tar.gz |
Staging: otus: fix netdev->priv usage
Now that netdev->priv is gone, fix things up properly in the otus driver
to use ml_priv as it should have always been doing.
Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/wwrap.c')
-rw-r--r-- | drivers/staging/otus/wwrap.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index a8729df..5768675 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c @@ -56,11 +56,11 @@ u32_t zfLnxUsbSubmitIntUrb(urb_t *urb, struct usb_device *usb, u16_t epnum, u16_ u16_t zfLnxGetFreeTxUrb(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t idx; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); //idx = ((macp->TxUrbTail + 1) & (ZM_MAX_TX_URB_NUM - 1)); @@ -77,17 +77,17 @@ u16_t zfLnxGetFreeTxUrb(zdev_t *dev) idx = 0xffff; } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return idx; } void zfLnxPutTxUrb(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t idx; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); idx = ((macp->TxUrbHead + 1) & (ZM_MAX_TX_URB_NUM - 1)); @@ -103,31 +103,31 @@ void zfLnxPutTxUrb(zdev_t *dev) macp->TxUrbHead, macp->TxUrbTail); } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); } u16_t zfLnxCheckTxBufferCnt(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t TxBufCnt; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); TxBufCnt = macp->TxBufCnt; - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return TxBufCnt; } UsbTxQ_t *zfLnxGetUsbTxBuffer(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t idx; UsbTxQ_t *TxQ; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); idx = ((macp->TxBufHead+1) & (ZM_MAX_TX_BUF_NUM - 1)); @@ -147,11 +147,11 @@ UsbTxQ_t *zfLnxGetUsbTxBuffer(zdev_t *dev) macp->TxBufHead, macp->TxBufTail); } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return NULL; } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return TxQ; } @@ -159,12 +159,12 @@ u16_t zfLnxPutUsbTxBuffer(zdev_t *dev, u8_t *hdr, u16_t hdrlen, u8_t *snap, u16_t snapLen, u8_t *tail, u16_t tailLen, zbuf_t *buf, u16_t offset) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t idx; UsbTxQ_t *TxQ; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); idx = ((macp->TxBufTail+1) & (ZM_MAX_TX_BUF_NUM - 1)); @@ -192,22 +192,22 @@ u16_t zfLnxPutUsbTxBuffer(zdev_t *dev, u8_t *hdr, u16_t hdrlen, { printk(KERN_ERR "zfLnxPutUsbTxBuffer UsbTxBufQ inconsistent: TxBufHead: %d, TxBufTail: %d, TxBufCnt: %d\n", macp->TxBufHead, macp->TxBufTail, macp->TxBufCnt); - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return 0xffff; } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return 0; } zbuf_t *zfLnxGetUsbRxBuffer(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; //u16_t idx; zbuf_t *buf; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); //idx = ((macp->RxBufHead+1) & (ZM_MAX_RX_URB_NUM - 1)); @@ -222,21 +222,21 @@ zbuf_t *zfLnxGetUsbRxBuffer(zdev_t *dev) { printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", macp->RxBufHead, macp->RxBufTail); - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return NULL; } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return buf; } u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u16_t idx; unsigned long irqFlag; - spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_lock_irqsave(&macp->cs_lock, irqFlag); idx = ((macp->RxBufTail+1) & (ZM_MAX_RX_URB_NUM - 1)); @@ -251,11 +251,11 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf) { printk("RxBufQ inconsistent: RxBufHead: %d, RxBufTail: %d\n", macp->RxBufHead, macp->RxBufTail); - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return 0xffff; } - spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock), irqFlag); + spin_unlock_irqrestore(&macp->cs_lock, irqFlag); return 0; } @@ -296,7 +296,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs) #endif { zdev_t* dev = urb->context; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; zbuf_t *buf; zbuf_t *new_buf; int status; @@ -546,7 +546,7 @@ void zfLnxUsbRegIn_callback(urb_t *urb, struct pt_regs *regs) zdev_t* dev = urb->context; u32_t rsp[64/4]; int status; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Check status for URB */ if (urb->status != 0){ @@ -595,7 +595,7 @@ void zfLnxUsbRegIn_callback(urb_t *urb, struct pt_regs *regs) u32_t zfLnxSubmitRegInUrb(zdev_t *dev) { u32_t ret; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Submit a rx urb */ //ret = zfLnxUsbSubmitBulkUrb(macp->RegInUrb, macp->udev, @@ -620,7 +620,7 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev) u8_t *puTxBuf = NULL; UsbTxQ_t *TxData; int len = 0; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; #if ZM_USB_TX_STREAM_MODE == 1 u8_t ii; u16_t offset = 0; @@ -797,7 +797,7 @@ u32_t zfLnxUsbSubmitTxData(zdev_t* dev) u32_t zfLnxUsbIn(zdev_t* dev, urb_t *urb, zbuf_t *buf) { u32_t ret; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Submit a rx urb */ ret = zfLnxUsbSubmitBulkUrb(urb, macp->udev, USB_WLAN_RX_PIPE, @@ -812,7 +812,7 @@ u32_t zfLnxUsbIn(zdev_t* dev, urb_t *urb, zbuf_t *buf) u32_t zfLnxUsbWriteReg(zdev_t* dev, u32_t* cmd, u16_t cmdLen) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; u32_t ret; #ifdef ZM_CONFIG_BIG_ENDIAN @@ -844,7 +844,7 @@ u32_t zfLnxUsbOut(zdev_t* dev, u8_t *hdr, u16_t hdrlen, u8_t *snap, u16_t snapLe u8_t *tail, u16_t tailLen, zbuf_t *buf, u16_t offset) { u32_t ret; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Check length of tail buffer */ //zm_assert((tailLen <= 16)); @@ -867,7 +867,7 @@ u32_t zfLnxUsbOut(zdev_t* dev, u8_t *hdr, u16_t hdrlen, u8_t *snap, u16_t snapLe void zfLnxInitUsbTxQ(zdev_t* dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; printk(KERN_ERR "zfwInitUsbTxQ\n"); @@ -885,7 +885,7 @@ void zfLnxInitUsbRxQ(zdev_t* dev) { u16_t i; zbuf_t *buf; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Zero memory for UsbRxBufQ */ memset(macp->UsbRxBufQ, 0, sizeof(zbuf_t *) * ZM_MAX_RX_URB_NUM); @@ -1086,7 +1086,7 @@ void kevent(void *data) zdev_t *dev = macp->device; #else zdev_t *dev = (zdev_t *) data; - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; #endif if (macp == NULL) @@ -1133,7 +1133,7 @@ void kevent(void *data) /************************************************************************/ u8_t zfLnxCreateThread(zdev_t *dev) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; /* Create Mutex and keventd */ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) @@ -1164,7 +1164,7 @@ u8_t zfLnxCreateThread(zdev_t *dev) /************************************************************************/ void zfLnxSignalThread(zdev_t *dev, int flag) { - struct usbdrv_private *macp = (struct usbdrv_private *)dev->priv; + struct usbdrv_private *macp = dev->ml_priv; if (macp == NULL) { |