diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 13:31:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 13:31:35 -0500 |
| commit | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (patch) | |
| tree | 32fbc17daf7879a9a86eb029096994be45cd136b /drivers/scsi/ipr.h | |
| parent | a2c78f7c1d393d89240ed5922d3aa8e439aec82e (diff) | |
| parent | 39b7f1e25a412b0ef31e516cfc2fa4f40235f263 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/ipr.h')
| -rw-r--r-- | drivers/scsi/ipr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index cbff3ea3cd89..8cf967108500 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
| @@ -1114,9 +1114,8 @@ struct ipr_ucode_image_header { | |||
| 1114 | #define ipr_warn(...) printk(KERN_WARNING IPR_NAME": "__VA_ARGS__) | 1114 | #define ipr_warn(...) printk(KERN_WARNING IPR_NAME": "__VA_ARGS__) |
| 1115 | #define ipr_dbg(...) IPR_DBG_CMD(printk(KERN_INFO IPR_NAME ": "__VA_ARGS__)) | 1115 | #define ipr_dbg(...) IPR_DBG_CMD(printk(KERN_INFO IPR_NAME ": "__VA_ARGS__)) |
| 1116 | 1116 | ||
| 1117 | #define ipr_sdev_printk(level, sdev, fmt, ...) \ | 1117 | #define ipr_sdev_printk(level, sdev, fmt, args...) \ |
| 1118 | printk(level IPR_NAME ": %d:%d:%d:%d: " fmt, sdev->host->host_no, \ | 1118 | sdev_printk(level, sdev, fmt, ## args) |
| 1119 | sdev->channel, sdev->id, sdev->lun, ##__VA_ARGS__) | ||
| 1120 | 1119 | ||
| 1121 | #define ipr_sdev_err(sdev, fmt, ...) \ | 1120 | #define ipr_sdev_err(sdev, fmt, ...) \ |
| 1122 | ipr_sdev_printk(KERN_ERR, sdev, fmt, ##__VA_ARGS__) | 1121 | ipr_sdev_printk(KERN_ERR, sdev, fmt, ##__VA_ARGS__) |