]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: ipack/bridges/tpci200: remove unneeded lock in irq handler
authorSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Mon, 25 Jun 2012 15:15:46 +0000 (17:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 17:50:00 +0000 (10:50 -0700)
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ipack/bridges/tpci200.c
drivers/staging/ipack/bridges/tpci200.h

index ae9f803db292be4367efa9f5ec56fc1d5255caca..2b83fa8e550a6951684b99dd727ff9f3e731e8a7 100644 (file)
@@ -302,13 +302,10 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
 {
        struct tpci200_board *tpci200 = (struct tpci200_board *) dev_id;
        int i;
-       unsigned long flags;
        unsigned short status_reg, reg_value;
        unsigned short unhandled_ints = 0;
        irqreturn_t ret = IRQ_NONE;
 
-       spin_lock_irqsave(&tpci200->info->access_lock, flags);
-
        /* Read status register */
        status_reg = readw(tpci200->info->interface_regs +
                           TPCI200_STATUS_REG);
@@ -351,7 +348,6 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
                }
        }
 
-       spin_unlock_irqrestore(&tpci200->info->access_lock, flags);
        return ret;
 }
 
@@ -414,7 +410,6 @@ static int tpci200_register(struct tpci200_board *tpci200)
                                           TPCI200_MEM8_SPACE_BAR),
                        TPCI200_MEM8_SIZE);
 
-       spin_lock_init(&tpci200->info->access_lock);
        ioidint_base = pci_resource_start(tpci200->info->pdev,
                                          TPCI200_IO_ID_INT_SPACES_BAR);
        mem_base = pci_resource_start(tpci200->info->pdev,
index 97ff0d6636b617778273679ce6a9a82e392be30e..d04510a89be4964de8af4553668b615e94845cc3 100644 (file)
@@ -136,7 +136,6 @@ struct tpci200_slot {
  * @interface_regs     Pointer to IP interface space (Bar 2)
  * @ioidint_space      Pointer to IP ID, IO and INT space (Bar 3)
  * @mem8_space         Pointer to MEM space (Bar 4)
- * @access_lock                Mutex lock for simultaneous access
  *
  */
 struct tpci200_infos {
@@ -145,7 +144,6 @@ struct tpci200_infos {
        void __iomem                    *interface_regs;
        void __iomem                    *ioidint_space;
        void __iomem                    *mem8_space;
-       spinlock_t                      access_lock;
        struct ipack_bus_device         *ipack_bus;
 };
 struct tpci200_board {