Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / sysdev / ppc4xx_hsta_msi.c

diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index a6a4dbd..ed9970f 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -85,7 +85,7 @@ static int hsta_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                        msi_bitmap_free_hwirqs(&ppc4xx_hsta_msi.bmp, irq, 1);
                        return -EINVAL;
                }
-               write_msi_msg(hwirq, &msg);
+               pci_write_msi_msg(hwirq, &msg);
        }
 
        return 0;
@@ -197,7 +197,6 @@ static struct platform_driver hsta_msi_driver = {
        .probe = hsta_msi_probe,
        .driver = {
                .name = "hsta-msi",
-               .owner = THIS_MODULE,
                .of_match_table = hsta_msi_ids,
        },
 };