Commit bae8bd16 authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez Committed by Greg Kroah-Hartman

Staging: ipack/bridges/tpci200: remove unneeded lock in irq handler

Signed-off-by: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55c0a6f4
...@@ -302,13 +302,10 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) ...@@ -302,13 +302,10 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
{ {
struct tpci200_board *tpci200 = (struct tpci200_board *) dev_id; struct tpci200_board *tpci200 = (struct tpci200_board *) dev_id;
int i; int i;
unsigned long flags;
unsigned short status_reg, reg_value; unsigned short status_reg, reg_value;
unsigned short unhandled_ints = 0; unsigned short unhandled_ints = 0;
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
spin_lock_irqsave(&tpci200->info->access_lock, flags);
/* Read status register */ /* Read status register */
status_reg = readw(tpci200->info->interface_regs + status_reg = readw(tpci200->info->interface_regs +
TPCI200_STATUS_REG); TPCI200_STATUS_REG);
...@@ -351,7 +348,6 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) ...@@ -351,7 +348,6 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
} }
} }
spin_unlock_irqrestore(&tpci200->info->access_lock, flags);
return ret; return ret;
} }
...@@ -414,7 +410,6 @@ static int tpci200_register(struct tpci200_board *tpci200) ...@@ -414,7 +410,6 @@ static int tpci200_register(struct tpci200_board *tpci200)
TPCI200_MEM8_SPACE_BAR), TPCI200_MEM8_SPACE_BAR),
TPCI200_MEM8_SIZE); TPCI200_MEM8_SIZE);
spin_lock_init(&tpci200->info->access_lock);
ioidint_base = pci_resource_start(tpci200->info->pdev, ioidint_base = pci_resource_start(tpci200->info->pdev,
TPCI200_IO_ID_INT_SPACES_BAR); TPCI200_IO_ID_INT_SPACES_BAR);
mem_base = pci_resource_start(tpci200->info->pdev, mem_base = pci_resource_start(tpci200->info->pdev,
......
...@@ -136,7 +136,6 @@ struct tpci200_slot { ...@@ -136,7 +136,6 @@ struct tpci200_slot {
* @interface_regs Pointer to IP interface space (Bar 2) * @interface_regs Pointer to IP interface space (Bar 2)
* @ioidint_space Pointer to IP ID, IO and INT space (Bar 3) * @ioidint_space Pointer to IP ID, IO and INT space (Bar 3)
* @mem8_space Pointer to MEM space (Bar 4) * @mem8_space Pointer to MEM space (Bar 4)
* @access_lock Mutex lock for simultaneous access
* *
*/ */
struct tpci200_infos { struct tpci200_infos {
...@@ -145,7 +144,6 @@ struct tpci200_infos { ...@@ -145,7 +144,6 @@ struct tpci200_infos {
void __iomem *interface_regs; void __iomem *interface_regs;
void __iomem *ioidint_space; void __iomem *ioidint_space;
void __iomem *mem8_space; void __iomem *mem8_space;
spinlock_t access_lock;
struct ipack_bus_device *ipack_bus; struct ipack_bus_device *ipack_bus;
}; };
struct tpci200_board { struct tpci200_board {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment