evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: ipack/bridges/tpci200: Remove side effects of tpci200_{request,free}_irq.

Browse source 
Use the __tpci200_{set,clear}_mask routines to access control
register.  Do not overwrite flags unrelated to interrupt handling.

Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jens Taprogge 2012-09-12 14:55:24 +02:00 • committed by Greg Kroah-Hartman
parent 0118681b2b
commit 9b27adbced
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/ipack/bridges/tpci200.c
View file

@ -278,37 +278,18 @@ out_disable_pci:
static int __tpci200_request_irq(struct tpci200_board *tpci200, static int __tpci200_request_irq(struct tpci200_board *tpci200,
struct ipack_device *dev) struct ipack_device *dev)
{ {
unsigned short slot_ctrl; __tpci200_set_mask(
&tpci200->info->interface_regs->control[dev->slot],
/* Set the default parameters of the slot TPCI200_INT0_EN | TPCI200_INT1_EN);
* 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]);
return 0; return 0;
} }
static void __tpci200_free_irq(struct tpci200_board *tpci200, static void __tpci200_free_irq(struct tpci200_board *tpci200,
struct ipack_device *dev) struct ipack_device *dev)
{ {
unsigned short slot_ctrl; __tpci200_clear_mask(
&tpci200->info->interface_regs->control[dev->slot],
/* Set the default parameters of the slot TPCI200_INT0_EN | TPCI200_INT1_EN);
* 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]);
} }
static int tpci200_free_irq(struct ipack_device *dev) static int tpci200_free_irq(struct ipack_device *dev)