--- drivers/ata/sata_nv.c

+++ drivers/ata/sata_nv.c

@@ -1673,7 +1673,6 @@ static void nv_mcp55_freeze(struct ata_p

mask = readl(mmio_base + NV_INT_ENABLE_MCP55);

mask &= ~(NV_INT_ALL_MCP55 << shift);

writel(mask, mmio_base + NV_INT_ENABLE_MCP55);

- ata_sff_freeze(ap);

}

static void nv_mcp55_thaw(struct ata_port *ap)

@@ -1687,7 +1686,6 @@ static void nv_mcp55_thaw(struct ata_por

mask = readl(mmio_base + NV_INT_ENABLE_MCP55);

mask |= (NV_INT_MASK_MCP55 << shift);

writel(mask, mmio_base + NV_INT_ENABLE_MCP55);

- ata_sff_thaw(ap);

}

static void nv_adma_error_handler(struct ata_port *ap)

@@ -2478,8 +2476,7 @@ static int nv_init_one(struct pci_dev *p

}

pci_set_master(pdev);

- return ata_host_activate(host, pdev->irq, ipriv->irq_handler,

- IRQF_SHARED, ipriv->sht);

+ return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);

}

#ifdef CONFIG_PM