aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 808d2a5b46bb..bb22a80d448f 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -199,7 +199,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
199 sector_t total_size, 199 sector_t total_size,
200 unsigned int block_size, InquiryData_struct *inq_buff, 200 unsigned int block_size, InquiryData_struct *inq_buff,
201 drive_info_struct *drv); 201 drive_info_struct *drv);
202static void __devinit cciss_interrupt_mode(ctlr_info_t *, __u32); 202static void __devinit cciss_interrupt_mode(ctlr_info_t *);
203static void start_io(ctlr_info_t *h); 203static void start_io(ctlr_info_t *h);
204static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size, 204static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size,
205 __u8 page_code, unsigned char scsi3addr[], 205 __u8 page_code, unsigned char scsi3addr[],
@@ -3932,7 +3932,7 @@ clean_up:
3932 * controllers that are capable. If not, we use IO-APIC mode. 3932 * controllers that are capable. If not, we use IO-APIC mode.
3933 */ 3933 */
3934 3934
3935static void __devinit cciss_interrupt_mode(ctlr_info_t *c, __u32 board_id) 3935static void __devinit cciss_interrupt_mode(ctlr_info_t *c)
3936{ 3936{
3937#ifdef CONFIG_PCI_MSI 3937#ifdef CONFIG_PCI_MSI
3938 int err; 3938 int err;
@@ -3941,9 +3941,8 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, __u32 board_id)
3941 }; 3941 };
3942 3942
3943 /* Some boards advertise MSI but don't really support it */ 3943 /* Some boards advertise MSI but don't really support it */
3944 if ((board_id == 0x40700E11) || 3944 if ((c->board_id == 0x40700E11) || (c->board_id == 0x40800E11) ||
3945 (board_id == 0x40800E11) || 3945 (c->board_id == 0x40820E11) || (c->board_id == 0x40830E11))
3946 (board_id == 0x40820E11) || (board_id == 0x40830E11))
3947 goto default_int_mode; 3946 goto default_int_mode;
3948 3947
3949 if (pci_find_capability(c->pdev, PCI_CAP_ID_MSIX)) { 3948 if (pci_find_capability(c->pdev, PCI_CAP_ID_MSIX)) {
@@ -4052,7 +4051,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
4052/* If the kernel supports MSI/MSI-X we will try to enable that functionality, 4051/* If the kernel supports MSI/MSI-X we will try to enable that functionality,
4053 * else we use the IO-APIC interrupt assigned to us by system ROM. 4052 * else we use the IO-APIC interrupt assigned to us by system ROM.
4054 */ 4053 */
4055 cciss_interrupt_mode(c, c->board_id); 4054 cciss_interrupt_mode(c);
4056 4055
4057 /* find the memory BAR */ 4056 /* find the memory BAR */
4058 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { 4057 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {