From da3e89082d8d3018b63589e435defd6bd9feb0f5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 Jan 2009 13:44:36 -0800 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/otus/wrap_mis.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/staging/otus/wrap_mis.c') diff --git a/drivers/staging/otus/wrap_mis.c b/drivers/staging/otus/wrap_mis.c index 18adf393a68..337918b9de9 100644 --- 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) -- cgit v1.2.3