diff options
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 5233e47eeb89..1f2099de0511 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -536,8 +536,8 @@ struct ata_port { | |||
536 | spinlock_t *lock; | 536 | spinlock_t *lock; |
537 | unsigned long flags; /* ATA_FLAG_xxx */ | 537 | unsigned long flags; /* ATA_FLAG_xxx */ |
538 | unsigned int pflags; /* ATA_PFLAG_xxx */ | 538 | unsigned int pflags; /* ATA_PFLAG_xxx */ |
539 | unsigned int id; /* unique id req'd by scsi midlyr */ | 539 | unsigned int print_id; /* user visible unique port ID */ |
540 | unsigned int port_no; /* unique port #; from zero */ | 540 | unsigned int port_no; /* 0 based port no. inside the host */ |
541 | 541 | ||
542 | struct ata_prd *prd; /* our SG list */ | 542 | struct ata_prd *prd; /* our SG list */ |
543 | dma_addr_t prd_dma; /* and its DMA mapping */ | 543 | dma_addr_t prd_dma; /* and its DMA mapping */ |
@@ -892,10 +892,10 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
892 | * printk helpers | 892 | * printk helpers |
893 | */ | 893 | */ |
894 | #define ata_port_printk(ap, lv, fmt, args...) \ | 894 | #define ata_port_printk(ap, lv, fmt, args...) \ |
895 | printk(lv"ata%u: "fmt, (ap)->id , ##args) | 895 | printk(lv"ata%u: "fmt, (ap)->print_id , ##args) |
896 | 896 | ||
897 | #define ata_dev_printk(dev, lv, fmt, args...) \ | 897 | #define ata_dev_printk(dev, lv, fmt, args...) \ |
898 | printk(lv"ata%u.%02u: "fmt, (dev)->ap->id, (dev)->devno , ##args) | 898 | printk(lv"ata%u.%02u: "fmt, (dev)->ap->print_id, (dev)->devno , ##args) |
899 | 899 | ||
900 | /* | 900 | /* |
901 | * ata_eh_info helpers | 901 | * ata_eh_info helpers |