Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / drivers / staging / otus / wrap_mis.c

diff --git a/drivers/staging/otus/wrap_mis.c b/drivers/staging/otus/wrap_mis.c
index 18adf393a68d953e497caf79ceff7b5ebb1c7afa..337918b9de9a1395a633fb77b57cdc569f600e4f 100644 (file)
--- a/drivers/staging/otus/wrap_mis.c
+++ b/drivers/staging/otus/wrap_mis.c
@@ -64,19 +64,20 @@ void zfwSleep(zdev_t* dev, u32_t ms)
 #ifdef ZM_HALPLUS_LOCK
 asmlinkage struct zsWlanDev *zfwGetWlanDev(zdev_t* dev)
 {
-    return ((struct zsWlanDev*)(((struct usbdrv_private*)dev->priv)->wd));
+       struct usbdrv_private *macp = dev->ml_priv;
+       return macp->wd;
 }
 
 asmlinkage void zfwEnterCriticalSection(zdev_t* dev)
 {
-    spin_lock_irqsave(&(((struct usbdrv_private *)(dev->priv))->cs_lock),
-            (((struct usbdrv_private *)(dev->priv))->hal_irqFlag));
+       struct usbdrv_private *macp = dev->ml_priv;
+       spin_lock_irqsave(&macp->cs_lock, macp->hal_irqFlag);
 }
 
 asmlinkage void zfwLeaveCriticalSection(zdev_t* dev)
 {
-    spin_unlock_irqrestore(&(((struct usbdrv_private *)(dev->priv))->cs_lock),
-            (((struct usbdrv_private *)(dev->priv))->hal_irqFlag));
+       struct usbdrv_private *macp = dev->ml_priv;
+       spin_unlock_irqrestore(&macp->cs_lock, macp->hal_irqFlag);
 }
 
 asmlinkage u8_t zfwBufReadByte(zdev_t* dev, zbuf_t* buf, u16_t offset)