From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/message/fusion/mptbase.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff -puN drivers/message/fusion/mptbase.c~git-infiniband-fixup drivers/message/fusion/mptbase.c --- a/drivers/message/fusion/mptbase.c~git-infiniband-fixup +++ a/drivers/message/fusion/mptbase.c @@ -1382,30 +1382,6 @@ mpt_attach(struct pci_dev *pdev, const s /* Set lookup ptr. */ list_add_tail(&ioc->list, &ioc_list); - ioc->pci_irq = -1; - if (pdev->irq) { - if (mpt_msi_enable && !pci_enable_msi(pdev)) - printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name); - - r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc); - - if (r < 0) { - printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n", - ioc->name, pdev->irq); - list_del(&ioc->list); - iounmap(mem); - kfree(ioc); - return -EBUSY; - } - - ioc->pci_irq = pdev->irq; - - pci_set_master(pdev); /* ?? */ - pci_set_drvdata(pdev, ioc); - - dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq)); - } - /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets. */ mpt_detect_bound_ports(ioc, pdev); _