aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsalvez <siglesias@igalia.com>2012-05-18 05:10:08 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-18 20:38:17 -0400
commitdd8a95ed1643f32f98012e93dd7af31a8d9538f4 (patch)
tree89c0acb792efee20edfb83963f7beaa341b6dd0f /drivers/staging
parentc63a7dd0e5be722095d93e45cd2cad8bf1a68c7f (diff)
Staging: ipack/bridges/tpci200: remove unneeded casts
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/ipack/bridges/tpci200.c36
1 files changed, 16 insertions, 20 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c
index c043345ef602..ad2870750235 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/staging/ipack/bridges/tpci200.c
@@ -321,8 +321,8 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
321 spin_lock_irqsave(&tpci200->info->access_lock, flags); 321 spin_lock_irqsave(&tpci200->info->access_lock, flags);
322 322
323 /* Read status register */ 323 /* Read status register */
324 status_reg = readw((void __iomem *) (tpci200->info->interface_regs + 324 status_reg = readw(tpci200->info->interface_regs +
325 TPCI200_STATUS_REG)); 325 TPCI200_STATUS_REG);
326 326
327 if (status_reg & TPCI200_SLOT_INT_MASK) { 327 if (status_reg & TPCI200_SLOT_INT_MASK) {
328 unhandled_ints = status_reg & TPCI200_SLOT_INT_MASK; 328 unhandled_ints = status_reg & TPCI200_SLOT_INT_MASK;
@@ -334,12 +334,10 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
334 ret = tpci200->slots[i].irq->handler(tpci200->slots[i].irq->arg); 334 ret = tpci200->slots[i].irq->handler(tpci200->slots[i].irq->arg);
335 335
336 /* Dummy reads */ 336 /* Dummy reads */
337 readw((void __iomem *) 337 readw(tpci200->slots[i].dev->io_space.address +
338 (tpci200->slots[i].dev->io_space.address + 338 0xC0);
339 0xC0)); 339 readw(tpci200->slots[i].dev->io_space.address +
340 readw((void __iomem *) 340 0xC2);
341 (tpci200->slots[i].dev->io_space.address +
342 0xC2));
343 341
344 unhandled_ints &= ~(((TPCI200_A_INT0 | TPCI200_A_INT1) << (2*i))); 342 unhandled_ints &= ~(((TPCI200_A_INT0 | TPCI200_A_INT1) << (2*i)));
345 } 343 }
@@ -352,13 +350,13 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id)
352 pr_info("No registered ISR for slot [%d:%d]!. IRQ will be disabled.\n", 350 pr_info("No registered ISR for slot [%d:%d]!. IRQ will be disabled.\n",
353 tpci200->number, i); 351 tpci200->number, i);
354 reg_value = readw( 352 reg_value = readw(
355 (void __iomem *)(tpci200->info->interface_regs + 353 tpci200->info->interface_regs +
356 control_reg[i])); 354 control_reg[i]);
357 reg_value &= 355 reg_value &=
358 ~(TPCI200_INT0_EN | TPCI200_INT1_EN); 356 ~(TPCI200_INT0_EN | TPCI200_INT1_EN);
359 writew(reg_value, 357 writew(reg_value,
360 (void __iomem *)(tpci200->info->interface_regs + 358 (tpci200->info->interface_regs +
361 control_reg[i])); 359 control_reg[i]));
362 } 360 }
363 } 361 }
364 } 362 }
@@ -659,9 +657,8 @@ static int tpci200_register(struct tpci200_board *tpci200)
659 (void __iomem *)mem_base + TPCI200_MEM8_GAP*i; 657 (void __iomem *)mem_base + TPCI200_MEM8_GAP*i;
660 tpci200->slots[i].mem_phys.size = TPCI200_MEM8_SIZE; 658 tpci200->slots[i].mem_phys.size = TPCI200_MEM8_SIZE;
661 659
662 writew(slot_ctrl, 660 writew(slot_ctrl, (tpci200->info->interface_regs +
663 (void __iomem *)(tpci200->info->interface_regs + 661 control_reg[i]));
664 control_reg[i]));
665 } 662 }
666 663
667 res = request_irq(tpci200->info->pdev->irq, 664 res = request_irq(tpci200->info->pdev->irq,
@@ -703,8 +700,8 @@ static int __tpci200_request_irq(struct tpci200_board *tpci200,
703 * clock rate 8 MHz 700 * clock rate 8 MHz
704 */ 701 */
705 slot_ctrl = TPCI200_INT0_EN | TPCI200_INT1_EN; 702 slot_ctrl = TPCI200_INT0_EN | TPCI200_INT1_EN;
706 writew(slot_ctrl, (void __iomem *)(tpci200->info->interface_regs + 703 writew(slot_ctrl, (tpci200->info->interface_regs +
707 control_reg[dev->slot])); 704 control_reg[dev->slot]));
708 705
709 return 0; 706 return 0;
710} 707}
@@ -723,9 +720,8 @@ static void __tpci200_free_irq(struct tpci200_board *tpci200,
723 * clock rate 8 MHz 720 * clock rate 8 MHz
724 */ 721 */
725 slot_ctrl = 0; 722 slot_ctrl = 0;
726 writew(slot_ctrl, 723 writew(slot_ctrl, (tpci200->info->interface_regs +
727 (void __iomem *)(tpci200->info->interface_regs + 724 control_reg[dev->slot]));
728 control_reg[dev->slot]));
729} 725}
730 726
731static int tpci200_free_irq(struct ipack_device *dev) 727static int tpci200_free_irq(struct ipack_device *dev)