Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify

[firefly-linux-kernel-4.4.55.git] / sound / pci / asihpi / hpioctl.c

diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 8f96749723761db852434b0da5535ff555f608dc..ef5019fe51930a7cedda5bc32949633d950dd878 100644 (file)
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -307,8 +307,8 @@ out:
        return err;
 }
 
-int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
-       const struct pci_device_id *pci_id)
+int asihpi_adapter_probe(struct pci_dev *pci_dev,
+                        const struct pci_device_id *pci_id)
 {
        int idx, nm;
        int adapter_index;
@@ -420,7 +420,7 @@ err:
        return -ENODEV;
 }
 
-void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
+void asihpi_adapter_remove(struct pci_dev *pci_dev)
 {
        int idx;
        struct hpi_message hm;