From b3f1deef2dc3749e1c16052f53a1d13d74db22af Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 10 Aug 2006 16:59:18 +0900 Subject: [PATCH] --- yaml --- r: 35385 b: refs/heads/master c: 4852ba24f647199be797545226c6d325db231937 h: refs/heads/master i: 35383: 54b8762a75194bca9575d522d29ae5b996128f96 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 1 - trunk/include/linux/libata.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fbdb7baf8d02..03f3fe58e3b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a88d1ac8dca898a7fb602ddd581bf4d2977509d +refs/heads/master: 4852ba24f647199be797545226c6d325db231937 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 2ef86b4e7f6d..3f963f206d4a 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -5223,7 +5223,6 @@ void ata_port_init(struct ata_port *ap, struct ata_host_set *host_set, ap->host_set = host_set; ap->dev = ent->dev; ap->port_no = port_no; - ap->hard_port_no = port_no; ap->pio_mask = ent->pio_mask; ap->mwdma_mask = ent->mwdma_mask; ap->udma_mask = ent->udma_mask; diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 30bfe8f1666e..ed749f778697 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -352,12 +352,10 @@ struct ata_probe_ent { struct scsi_host_template *sht; struct ata_ioports port[ATA_MAX_PORTS]; unsigned int n_ports; - unsigned int hard_port_no; unsigned int dummy_port_mask; unsigned int pio_mask; unsigned int mwdma_mask; unsigned int udma_mask; - unsigned int legacy_mode; unsigned long irq; unsigned long irq2; unsigned int irq_flags; @@ -509,7 +507,6 @@ struct ata_port { unsigned int pflags; /* ATA_PFLAG_xxx */ unsigned int id; /* unique id req'd by scsi midlyr */ unsigned int port_no; /* unique port #; from zero */ - unsigned int hard_port_no; /* hardware port #; from zero */ struct ata_prd *prd; /* our SG list */ dma_addr_t prd_dma; /* and its DMA mapping */