aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-10-05 15:55:11 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-23 15:17:36 -0400
commit8022fbdacb0e9193a5dfb666479d1fc2ca63ecf1 (patch)
treef7c16ab8a3400efdaa9f7c62647549f5ea07bc48 /drivers/scsi
parent3fb364e089e05c35ead55a08d56d3004193681f6 (diff)
[SCSI] sym53c8xx: Get rid of IRQ_FMT and IRQ_PRM
These macros aren't needed any more. They used to be used for SPARC. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_glue.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 84a0fc571ceb..9521f0ea4129 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -54,9 +54,6 @@
54#define NAME53C "sym53c" 54#define NAME53C "sym53c"
55#define NAME53C8XX "sym53c8xx" 55#define NAME53C8XX "sym53c8xx"
56 56
57#define IRQ_FMT "%d"
58#define IRQ_PRM(x) (x)
59
60struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP; 57struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP;
61unsigned int sym_debug_flags = 0; 58unsigned int sym_debug_flags = 0;
62 59
@@ -1196,8 +1193,8 @@ static int sym_host_info(struct sym_hcb *np, char *ptr, off_t offset, int len)
1196 copy_info(&info, "Chip " NAME53C "%s, device id 0x%x, " 1193 copy_info(&info, "Chip " NAME53C "%s, device id 0x%x, "
1197 "revision id 0x%x\n", np->s.chip_name, 1194 "revision id 0x%x\n", np->s.chip_name,
1198 np->s.device->device, np->s.device->revision); 1195 np->s.device->device, np->s.device->revision);
1199 copy_info(&info, "At PCI address %s, IRQ " IRQ_FMT "\n", 1196 copy_info(&info, "At PCI address %s, IRQ %u\n",
1200 pci_name(np->s.device), IRQ_PRM(np->s.device->irq)); 1197 pci_name(np->s.device), np->s.device->irq);
1201 copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n", 1198 copy_info(&info, "Min. period factor %d, %s SCSI BUS%s\n",
1202 (int) (np->minsync_dt ? np->minsync_dt : np->minsync), 1199 (int) (np->minsync_dt ? np->minsync_dt : np->minsync),
1203 np->maxwide ? "Wide" : "Narrow", 1200 np->maxwide ? "Wide" : "Narrow",
@@ -1283,9 +1280,9 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
1283 unsigned long flags; 1280 unsigned long flags;
1284 struct sym_fw *fw; 1281 struct sym_fw *fw;
1285 1282
1286 printk(KERN_INFO "sym%d: <%s> rev 0x%x at pci %s irq " IRQ_FMT "\n", 1283 printk(KERN_INFO "sym%d: <%s> rev 0x%x at pci %s irq %u\n",
1287 unit, dev->chip.name, pdev->revision, pci_name(pdev), 1284 unit, dev->chip.name, pdev->revision, pci_name(pdev),
1288 IRQ_PRM(pdev->irq)); 1285 pdev->irq);
1289 1286
1290 /* 1287 /*
1291 * Get the firmware for this chip. 1288 * Get the firmware for this chip.
@@ -1370,7 +1367,7 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
1370 * we do not want to share the INTR line at all. 1367 * we do not want to share the INTR line at all.
1371 */ 1368 */
1372 if (request_irq(pdev->irq, sym53c8xx_intr, IRQF_SHARED, NAME53C8XX, np)) { 1369 if (request_irq(pdev->irq, sym53c8xx_intr, IRQF_SHARED, NAME53C8XX, np)) {
1373 printf_err("%s: request irq %d failure\n", 1370 printf_err("%s: request irq %u failure\n",
1374 sym_name(np), pdev->irq); 1371 sym_name(np), pdev->irq);
1375 goto attach_failed; 1372 goto attach_failed;
1376 } 1373 }