diff options
Diffstat (limited to 'drivers/block/DAC960.c')
-rw-r--r-- | drivers/block/DAC960.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index b3f639fbf220..3e8ab84b9447 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -2698,8 +2698,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device, | |||
2698 | { | 2698 | { |
2699 | struct DAC960_privdata *privdata = | 2699 | struct DAC960_privdata *privdata = |
2700 | (struct DAC960_privdata *)entry->driver_data; | 2700 | (struct DAC960_privdata *)entry->driver_data; |
2701 | irqreturn_t (*InterruptHandler)(int, void *, struct pt_regs *) = | 2701 | irq_handler_t InterruptHandler = privdata->InterruptHandler; |
2702 | privdata->InterruptHandler; | ||
2703 | unsigned int MemoryWindowSize = privdata->MemoryWindowSize; | 2702 | unsigned int MemoryWindowSize = privdata->MemoryWindowSize; |
2704 | DAC960_Controller_T *Controller = NULL; | 2703 | DAC960_Controller_T *Controller = NULL; |
2705 | unsigned char DeviceFunction = PCI_Device->devfn; | 2704 | unsigned char DeviceFunction = PCI_Device->devfn; |
@@ -5253,8 +5252,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) | |||
5253 | */ | 5252 | */ |
5254 | 5253 | ||
5255 | static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel, | 5254 | static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel, |
5256 | void *DeviceIdentifier, | 5255 | void *DeviceIdentifier) |
5257 | struct pt_regs *InterruptRegisters) | ||
5258 | { | 5256 | { |
5259 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5257 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5260 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5258 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5295,8 +5293,7 @@ static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel, | |||
5295 | */ | 5293 | */ |
5296 | 5294 | ||
5297 | static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel, | 5295 | static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel, |
5298 | void *DeviceIdentifier, | 5296 | void *DeviceIdentifier) |
5299 | struct pt_regs *InterruptRegisters) | ||
5300 | { | 5297 | { |
5301 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5298 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5302 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5299 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5338,8 +5335,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel, | |||
5338 | */ | 5335 | */ |
5339 | 5336 | ||
5340 | static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel, | 5337 | static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel, |
5341 | void *DeviceIdentifier, | 5338 | void *DeviceIdentifier) |
5342 | struct pt_regs *InterruptRegisters) | ||
5343 | { | 5339 | { |
5344 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5340 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5345 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5341 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5381,8 +5377,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel, | |||
5381 | */ | 5377 | */ |
5382 | 5378 | ||
5383 | static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel, | 5379 | static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel, |
5384 | void *DeviceIdentifier, | 5380 | void *DeviceIdentifier) |
5385 | struct pt_regs *InterruptRegisters) | ||
5386 | { | 5381 | { |
5387 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5382 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5388 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5383 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5420,8 +5415,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel, | |||
5420 | */ | 5415 | */ |
5421 | 5416 | ||
5422 | static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel, | 5417 | static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel, |
5423 | void *DeviceIdentifier, | 5418 | void *DeviceIdentifier) |
5424 | struct pt_regs *InterruptRegisters) | ||
5425 | { | 5419 | { |
5426 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5420 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5427 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5421 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5459,8 +5453,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel, | |||
5459 | */ | 5453 | */ |
5460 | 5454 | ||
5461 | static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel, | 5455 | static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel, |
5462 | void *DeviceIdentifier, | 5456 | void *DeviceIdentifier) |
5463 | struct pt_regs *InterruptRegisters) | ||
5464 | { | 5457 | { |
5465 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5458 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5466 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5459 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |
@@ -5498,8 +5491,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel, | |||
5498 | */ | 5491 | */ |
5499 | 5492 | ||
5500 | static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel, | 5493 | static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel, |
5501 | void *DeviceIdentifier, | 5494 | void *DeviceIdentifier) |
5502 | struct pt_regs *InterruptRegisters) | ||
5503 | { | 5495 | { |
5504 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; | 5496 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; |
5505 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; | 5497 | void __iomem *ControllerBaseAddress = Controller->BaseAddress; |