diff options
-rw-r--r-- | drivers/scsi/libata-core.c | 1 | ||||
-rw-r--r-- | include/linux/libata.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 2ef86b4e7f6d..3f963f206d4a 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -5223,7 +5223,6 @@ void ata_port_init(struct ata_port *ap, struct ata_host_set *host_set, | |||
5223 | ap->host_set = host_set; | 5223 | ap->host_set = host_set; |
5224 | ap->dev = ent->dev; | 5224 | ap->dev = ent->dev; |
5225 | ap->port_no = port_no; | 5225 | ap->port_no = port_no; |
5226 | ap->hard_port_no = port_no; | ||
5227 | ap->pio_mask = ent->pio_mask; | 5226 | ap->pio_mask = ent->pio_mask; |
5228 | ap->mwdma_mask = ent->mwdma_mask; | 5227 | ap->mwdma_mask = ent->mwdma_mask; |
5229 | ap->udma_mask = ent->udma_mask; | 5228 | ap->udma_mask = ent->udma_mask; |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 30bfe8f1666e..ed749f778697 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -352,12 +352,10 @@ struct ata_probe_ent { | |||
352 | struct scsi_host_template *sht; | 352 | struct scsi_host_template *sht; |
353 | struct ata_ioports port[ATA_MAX_PORTS]; | 353 | struct ata_ioports port[ATA_MAX_PORTS]; |
354 | unsigned int n_ports; | 354 | unsigned int n_ports; |
355 | unsigned int hard_port_no; | ||
356 | unsigned int dummy_port_mask; | 355 | unsigned int dummy_port_mask; |
357 | unsigned int pio_mask; | 356 | unsigned int pio_mask; |
358 | unsigned int mwdma_mask; | 357 | unsigned int mwdma_mask; |
359 | unsigned int udma_mask; | 358 | unsigned int udma_mask; |
360 | unsigned int legacy_mode; | ||
361 | unsigned long irq; | 359 | unsigned long irq; |
362 | unsigned long irq2; | 360 | unsigned long irq2; |
363 | unsigned int irq_flags; | 361 | unsigned int irq_flags; |
@@ -509,7 +507,6 @@ struct ata_port { | |||
509 | unsigned int pflags; /* ATA_PFLAG_xxx */ | 507 | unsigned int pflags; /* ATA_PFLAG_xxx */ |
510 | unsigned int id; /* unique id req'd by scsi midlyr */ | 508 | unsigned int id; /* unique id req'd by scsi midlyr */ |
511 | unsigned int port_no; /* unique port #; from zero */ | 509 | unsigned int port_no; /* unique port #; from zero */ |
512 | unsigned int hard_port_no; /* hardware port #; from zero */ | ||
513 | 510 | ||
514 | struct ata_prd *prd; /* our SG list */ | 511 | struct ata_prd *prd; /* our SG list */ |
515 | dma_addr_t prd_dma; /* and its DMA mapping */ | 512 | dma_addr_t prd_dma; /* and its DMA mapping */ |