From: VMware, Inc <>
Date: Fri, 12 Apr 2013 19:39:20 +0000 (-0700)
Subject: Remove __devblah from Linux drivers
X-Git-Tag: 2013.04.16-1098359~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8b53c3b4e013c29bb6718b0355a2520197aede6;p=thirdparty%2Fopen-vm-tools.git

Remove __devblah from Linux drivers

GregKH recently pulled __devblah() from 3.8-rc3, which means our
drivers are now breaking.  Since it's useless anyway, and always has
been, just yank it completely.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vmci/linux/driver.c b/open-vm-tools/modules/linux/vmci/linux/driver.c
index 654ac296c..79128dc7a 100644
--- a/open-vm-tools/modules/linux/vmci/linux/driver.c
+++ b/open-vm-tools/modules/linux/vmci/linux/driver.c
@@ -128,7 +128,7 @@ static struct pci_driver vmci_driver = {
    .name     = VMCI_DEVICE_NAME,
    .id_table = vmci_ids,
    .probe = vmci_probe_device,
-   .remove = __devexit_p(vmci_remove_device),
+   .remove = vmci_remove_device,
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
@@ -1747,7 +1747,7 @@ vmci_enable_msix(struct pci_dev *pdev) // IN
  *-----------------------------------------------------------------------------
  */
 
-static int __devinit
+static int
 vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
                   const struct pci_device_id *id) // IN: matching device ID
 {
@@ -1975,7 +1975,7 @@ vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
  *-----------------------------------------------------------------------------
  */
 
-static void __devexit
+static void
 vmci_remove_device(struct pci_dev* pdev)
 {
    struct vmci_device *dev = pci_get_drvdata(pdev);
@@ -2030,8 +2030,6 @@ vmci_remove_device(struct pci_dev* pdev)
 }
 
 
-
-
 /*
  *-----------------------------------------------------------------------------
  *
diff --git a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
index c96b669fc..b220c6aac 100644
--- a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
+++ b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
@@ -25,8 +25,8 @@
 #ifndef _VMCI_VERSION_H_
 #define _VMCI_VERSION_H_
 
-#define VMCI_DRIVER_VERSION          9.5.11.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,5,11,0
-#define VMCI_DRIVER_VERSION_STRING   "9.5.11.0"
+#define VMCI_DRIVER_VERSION          9.5.12.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,5,12,0
+#define VMCI_DRIVER_VERSION_STRING   "9.5.12.0"
 
 #endif /* _VMCI_VERSION_H_ */