hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cciss: remove board_id parameter from cciss_interrupt_mode() 

cciss: remove board_id parameter from cciss_interrupt_mode()

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Stephen M. Cameron 2010-07-19 13:45:05 -05:00 committed by Jens Axboe
parent dd9c426e92
commit dac5488a9e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/block/cciss.c
View File

@ -199,7 +199,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
sector_t total_size, sector_t total_size,
unsigned int block_size, InquiryData_struct *inq_buff, unsigned int block_size, InquiryData_struct *inq_buff,
drive_info_struct *drv); drive_info_struct *drv);
static void __devinit cciss_interrupt_mode(ctlr_info_t *, __u32); static void __devinit cciss_interrupt_mode(ctlr_info_t *);
static void start_io(ctlr_info_t *h); static void start_io(ctlr_info_t *h);
static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size, static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size,
__u8 page_code, unsigned char scsi3addr[], __u8 page_code, unsigned char scsi3addr[],
@ -3932,7 +3932,7 @@ clean_up:
* controllers that are capable. If not, we use IO-APIC mode. * controllers that are capable. If not, we use IO-APIC mode.
*/ */
static void __devinit cciss_interrupt_mode(ctlr_info_t *c, __u32 board_id) static void __devinit cciss_interrupt_mode(ctlr_info_t *c)
{ {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
int err; int err;
@ -3941,9 +3941,8 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *c, __u32 board_id)
}; };
/* Some boards advertise MSI but don't really support it */ /* Some boards advertise MSI but don't really support it */
if ((board_id == 0x40700E11) || if ((c->board_id == 0x40700E11) || (c->board_id == 0x40800E11) ||
(board_id == 0x40800E11) || (c->board_id == 0x40820E11) || (c->board_id == 0x40830E11))
(board_id == 0x40820E11) || (board_id == 0x40830E11))
goto default_int_mode; goto default_int_mode;
if (pci_find_capability(c->pdev, PCI_CAP_ID_MSIX)) { if (pci_find_capability(c->pdev, PCI_CAP_ID_MSIX)) {
@ -4052,7 +4051,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
/* If the kernel supports MSI/MSI-X we will try to enable that functionality, /* If the kernel supports MSI/MSI-X we will try to enable that functionality,
* else we use the IO-APIC interrupt assigned to us by system ROM. * else we use the IO-APIC interrupt assigned to us by system ROM.
*/ */
cciss_interrupt_mode(c, c->board_id); cciss_interrupt_mode(c);
/* find the memory BAR */ /* find the memory BAR */
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {