From: Andrew Morton All this renaming and moving everything is getting very boring. Why am I sitting on an ata driver anyway? Cc: Alan Cox Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton --- drivers/ata/ata_jmicron.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/ata/ata_jmicron.c~1-of-2-jmicron-driver-fix drivers/ata/ata_jmicron.c --- a/drivers/ata/ata_jmicron.c~1-of-2-jmicron-driver-fix +++ a/drivers/ata/ata_jmicron.c @@ -41,11 +41,11 @@ typedef enum { static int jmicron_pre_reset(struct ata_port *ap) { - struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); + struct pci_dev *pdev = to_pci_dev(ap->host->dev); u32 control; u32 control5; - int port_mask = 1<< (4 * ap->hard_port_no); - int port = ap->hard_port_no; + int port_mask = 1<< (4 * ap->port_no); + int port = ap->port_no; port_type port_map[2]; /* Check if our port is enabled */ @@ -194,7 +194,7 @@ static int jmicron_init_one (struct pci_ { static struct ata_port_info info = { .sht = &jmicron_sht, - .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, + .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, .pio_mask = 0x1f, .mwdma_mask = 0x07, _