Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317538
b: refs/heads/master
c: bae8bd1
h: refs/heads/master
v: v3
  • Loading branch information
Samuel Iglesias Gonsalvez authored and Greg Kroah-Hartman committed Jun 25, 2012
1 parent 30a2522 commit 62f0410
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55c0a6f470517918a996a525325db6a88435c298
refs/heads/master: bae8bd165ae3fee0573eb7eb377a479cf26e4277
5 changes: 0 additions & 5 deletions trunk/drivers/staging/ipack/bridges/tpci200.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -351,7 +348,6 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
}
}

spin_unlock_irqrestore(&tpci200->info->access_lock, flags);
return ret;
}

Expand Down Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/ipack/bridges/tpci200.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down

0 comments on commit 62f0410

Please sign in to comment.