diff options
Diffstat (limited to 'drivers/message/fusion')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index a30084076ac8..59690cbabfca 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -63,9 +63,6 @@ | |||
63 | #ifdef CONFIG_MTRR | 63 | #ifdef CONFIG_MTRR |
64 | #include <asm/mtrr.h> | 64 | #include <asm/mtrr.h> |
65 | #endif | 65 | #endif |
66 | #ifdef __sparc__ | ||
67 | #include <asm/irq.h> /* needed for __irq_itoa() proto */ | ||
68 | #endif | ||
69 | 66 | ||
70 | #include "mptbase.h" | 67 | #include "mptbase.h" |
71 | 68 | ||
@@ -1394,13 +1391,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1394 | r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc); | 1391 | r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc); |
1395 | 1392 | ||
1396 | if (r < 0) { | 1393 | if (r < 0) { |
1397 | #ifndef __sparc__ | ||
1398 | printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n", | 1394 | printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n", |
1399 | ioc->name, pdev->irq); | 1395 | ioc->name, pdev->irq); |
1400 | #else | ||
1401 | printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n", | ||
1402 | ioc->name, __irq_itoa(pdev->irq)); | ||
1403 | #endif | ||
1404 | list_del(&ioc->list); | 1396 | list_del(&ioc->list); |
1405 | iounmap(mem); | 1397 | iounmap(mem); |
1406 | kfree(ioc); | 1398 | kfree(ioc); |
@@ -1412,11 +1404,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1412 | pci_set_master(pdev); /* ?? */ | 1404 | pci_set_master(pdev); /* ?? */ |
1413 | pci_set_drvdata(pdev, ioc); | 1405 | pci_set_drvdata(pdev, ioc); |
1414 | 1406 | ||
1415 | #ifndef __sparc__ | ||
1416 | dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq)); | 1407 | dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq)); |
1417 | #else | ||
1418 | dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc->name, __irq_itoa(pdev->irq))); | ||
1419 | #endif | ||
1420 | } | 1408 | } |
1421 | 1409 | ||
1422 | /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets. | 1410 | /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets. |
@@ -5647,11 +5635,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh | |||
5647 | a[5], a[4], a[3], a[2], a[1], a[0]); | 5635 | a[5], a[4], a[3], a[2], a[1], a[0]); |
5648 | } | 5636 | } |
5649 | 5637 | ||
5650 | #ifndef __sparc__ | ||
5651 | y += sprintf(buffer+len+y, ", IRQ=%d", ioc->pci_irq); | 5638 | y += sprintf(buffer+len+y, ", IRQ=%d", ioc->pci_irq); |
5652 | #else | ||
5653 | y += sprintf(buffer+len+y, ", IRQ=%s", __irq_itoa(ioc->pci_irq)); | ||
5654 | #endif | ||
5655 | 5639 | ||
5656 | if (!ioc->active) | 5640 | if (!ioc->active) |
5657 | y += sprintf(buffer+len+y, " (disabled)"); | 5641 | y += sprintf(buffer+len+y, " (disabled)"); |