Merge tag 'nfs-for-3.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[firefly-linux-kernel-4.4.55.git] / sound / pci / asihpi / hpioctl.c
index 60915620556289dd4701ea6434b797e485d1f7b4..ef5019fe51930a7cedda5bc32949633d950dd878 100644 (file)
@@ -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;
@@ -326,7 +326,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
                pci_dev->subsystem_device, pci_dev->devfn);
 
        if (pci_enable_device(pci_dev) < 0) {
-               dev_printk(KERN_ERR, &pci_dev->dev,
+               dev_err(&pci_dev->dev,
                        "pci_enable_device failed, disabling device\n");
                return -EIO;
        }
@@ -398,9 +398,8 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
        mutex_init(&adapters[adapter_index].mutex);
        pci_set_drvdata(pci_dev, &adapters[adapter_index]);
 
-       dev_printk(KERN_INFO, &pci_dev->dev,
-               "probe succeeded for ASI%04X HPI index %d\n",
-               adapter.adapter->type, adapter_index);
+       dev_info(&pci_dev->dev, "probe succeeded for ASI%04X HPI index %d\n",
+                adapter.adapter->type, adapter_index);
 
        return 0;
 
@@ -421,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;
@@ -448,11 +447,11 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
 
        pci_set_drvdata(pci_dev, NULL);
        if (1)
-               dev_printk(KERN_INFO, &pci_dev->dev,
-                       "remove %04x:%04x,%04x:%04x,%04x," " HPI index %d.\n",
-                       pci_dev->vendor, pci_dev->device,
-                       pci_dev->subsystem_vendor, pci_dev->subsystem_device,
-                       pci_dev->devfn, pa->adapter->index);
+               dev_info(&pci_dev->dev,
+                        "remove %04x:%04x,%04x:%04x,%04x, HPI index %d\n",
+                        pci_dev->vendor, pci_dev->device,
+                        pci_dev->subsystem_vendor, pci_dev->subsystem_device,
+                        pci_dev->devfn, pa->adapter->index);
 
        memset(pa, 0, sizeof(*pa));
 }