Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / rapidio / rio-access.c

diff --git a/drivers/rapidio/rio-access.c b/drivers/rapidio/rio-access.c
index b9fab2a..a3824ba 100644 (file)
--- a/drivers/rapidio/rio-access.c
+++ b/drivers/rapidio/rio-access.c
@@ -17,8 +17,8 @@
  * These interrupt-safe spinlocks protect all accesses to RIO
  * configuration space and doorbell access.
  */
-static spinlock_t rio_config_lock = SPIN_LOCK_UNLOCKED;
-static spinlock_t rio_doorbell_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(rio_config_lock);
+static DEFINE_SPINLOCK(rio_doorbell_lock);
 
 /*
  *  Wrappers for all RIO configuration access functions.  They just check
@@ -48,7 +48,7 @@ int __rio_local_read_config_##size \
        u32 data = 0;                                                   \
        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
        spin_lock_irqsave(&rio_config_lock, flags);                     \
-       res = mport->ops->lcread(mport->id, offset, len, &data);        \
+       res = mport->ops->lcread(mport, mport->id, offset, len, &data); \
        *value = (type)data;                                            \
        spin_unlock_irqrestore(&rio_config_lock, flags);                \
        return res;                                                     \
@@ -71,7 +71,7 @@ int __rio_local_write_config_##size \
        unsigned long flags;                                            \
        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
        spin_lock_irqsave(&rio_config_lock, flags);                     \
-       res = mport->ops->lcwrite(mport->id, offset, len, value);       \
+       res = mport->ops->lcwrite(mport, mport->id, offset, len, value);\
        spin_unlock_irqrestore(&rio_config_lock, flags);                \
        return res;                                                     \
 }
@@ -108,7 +108,7 @@ int rio_mport_read_config_##size \
        u32 data = 0;                                                   \
        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
        spin_lock_irqsave(&rio_config_lock, flags);                     \
-       res = mport->ops->cread(mport->id, destid, hopcount, offset, len, &data); \
+       res = mport->ops->cread(mport, mport->id, destid, hopcount, offset, len, &data); \
        *value = (type)data;                                            \
        spin_unlock_irqrestore(&rio_config_lock, flags);                \
        return res;                                                     \
@@ -131,7 +131,7 @@ int rio_mport_write_config_##size \
        unsigned long flags;                                            \
        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
        spin_lock_irqsave(&rio_config_lock, flags);                     \
-       res = mport->ops->cwrite(mport->id, destid, hopcount, offset, len, value); \
+       res = mport->ops->cwrite(mport, mport->id, destid, hopcount, offset, len, value); \
        spin_unlock_irqrestore(&rio_config_lock, flags);                \
        return res;                                                     \
 }
@@ -166,7 +166,7 @@ int rio_mport_send_doorbell(struct rio_mport *mport, u16 destid, u16 data)
        unsigned long flags;
 
        spin_lock_irqsave(&rio_doorbell_lock, flags);
-       res = mport->ops->dsend(mport->id, destid, data);
+       res = mport->ops->dsend(mport, mport->id, destid, data);
        spin_unlock_irqrestore(&rio_doorbell_lock, flags);
 
        return res;