From 43992ceb0a544c976313e5c661e84de8648d1778 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Wed, 12 Sep 2012 14:55:24 +0200 Subject: [PATCH] --- yaml --- r: 325229 b: refs/heads/master c: 9b27adbced2455bfd7e5d1b76a7f151de3d25dec h: refs/heads/master i: 325227: 2c4cadd5e53165aa0aeba6aa98e1ce2b7f9be37e v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 31 ++++--------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 58a25f54fdf1..af8f21bcc6cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0118681b2bc2f182b7cd4c6569632cf2729cc73e +refs/heads/master: 9b27adbced2455bfd7e5d1b76a7f151de3d25dec diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index 25605196dbac..3285dade2dd8 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -278,37 +278,18 @@ static int tpci200_register(struct tpci200_board *tpci200) static int __tpci200_request_irq(struct tpci200_board *tpci200, struct ipack_device *dev) { - unsigned short slot_ctrl; - - /* Set the default parameters of the slot - * INT0 enabled, level sensitive - * INT1 enabled, level sensitive - * error interrupt disabled - * timeout interrupt disabled - * recover time disabled - * clock rate 8 MHz - */ - slot_ctrl = TPCI200_INT0_EN | TPCI200_INT1_EN; - writew(slot_ctrl, &tpci200->info->interface_regs->control[dev->slot]); - + __tpci200_set_mask( + &tpci200->info->interface_regs->control[dev->slot], + TPCI200_INT0_EN | TPCI200_INT1_EN); return 0; } static void __tpci200_free_irq(struct tpci200_board *tpci200, struct ipack_device *dev) { - unsigned short slot_ctrl; - - /* Set the default parameters of the slot - * INT0 disabled, level sensitive - * INT1 disabled, level sensitive - * error interrupt disabled - * timeout interrupt disabled - * recover time disabled - * clock rate 8 MHz - */ - slot_ctrl = 0; - writew(slot_ctrl, &tpci200->info->interface_regs->control[dev->slot]); + __tpci200_clear_mask( + &tpci200->info->interface_regs->control[dev->slot], + TPCI200_INT0_EN | TPCI200_INT1_EN); } static int tpci200_free_irq(struct ipack_device *dev)