opencompute-developers team mailing list archive

[Blake Rouse <blake.rouse@xxxxxxxxxxxxx>]

Blake Rouse has proposed merging lp:~blake-rouse/opencompute/mei-dkms into lp:opencompute/mei.

Requested reviews:
  Open Compute Developers (opencompute-developers)
Related bugs:
  Bug #1288265 in The Open Compute Project: "mei-dkms fails to build on trusty"
  https://bugs.launchpad.net/opencompute/+bug/1288265

For more details, see:
https://code.launchpad.net/~blake-rouse/opencompute/mei-dkms/+merge/209474

Fix for building module on trusty.
-- 
https://code.launchpad.net/~blake-rouse/opencompute/mei-dkms/+merge/209474
Your team Open Compute Developers is requested to review the proposed merge of lp:~blake-rouse/opencompute/mei-dkms into lp:opencompute/mei.

=== modified file 'mei-7.1.21.4.S/dkms.conf'
--- mei-7.1.21.4.S/dkms.conf	2013-08-04 01:44:16 +0000
+++ mei-7.1.21.4.S/dkms.conf	2014-03-05 15:03:31 +0000
@@ -6,5 +6,5 @@
 MAKE="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 CLEAN="make -C clean"
 AUTOINSTALL=yes
-BUILD_EXCLUSIVE_KERNEL="3.(2|5).*"
+BUILD_EXCLUSIVE_KERNEL="3.(2|5|13).*"
 REMAKE_INITRD=yes

=== modified file 'mei-7.1.21.4.S/main.c'
--- mei-7.1.21.4.S/main.c	2013-08-04 01:44:16 +0000
+++ mei-7.1.21.4.S/main.c	2014-03-05 15:03:31 +0000
@@ -119,8 +119,8 @@
  *
  * returns 0 on success, <0 on failure.
  */
-static int __devinit mei_probe(struct pci_dev *pdev,
-				const struct pci_device_id *ent)
+static int mei_probe(struct pci_dev *pdev,
+	             const struct pci_device_id *ent)
 {
 	struct mei_device *dev;
 	int err;
@@ -211,7 +211,7 @@
  * mei_remove is called by the PCI subsystem to alert the driver
  * that it should release a PCI device.
  */
-static void __devexit mei_remove(struct pci_dev *pdev)
+static void mei_remove(struct pci_dev *pdev)
 {
 	struct mei_device *dev;
 
@@ -1154,8 +1154,8 @@
 	.name = mei_driver_name,
 	.id_table = mei_pci_tbl,
 	.probe = mei_probe,
-	.remove = __devexit_p(mei_remove),
-	.shutdown = __devexit_p(mei_remove),
+	.remove = mei_remove,
+	.shutdown = mei_remove,
 	.driver.pm = MEI_PM_OPS,
 };