--- aclpci.c.orig	2017-07-28 17:09:32.691397909 +0900
+++ aclpci.c	2017-07-28 17:11:01.907390525 +0900
@@ -64,12 +64,12 @@
 #define USE_MSI 0
 
 /* Static function declarations */
-static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id);
-static int __devinit init_chrdev (struct aclpci_dev *aclpci);
-static void __devexit remove(struct pci_dev *dev);
+static int /*__devinit*/ probe(struct pci_dev *dev, const struct pci_device_id *id);
+static int /*__devinit*/ init_chrdev (struct aclpci_dev *aclpci);
+static void /*__devexit*/ remove(struct pci_dev *dev);
 
-static int __devinit scan_bars(struct aclpci_dev *aclpci, struct pci_dev *dev);
-static int __devinit map_bars(struct aclpci_dev *aclpci, struct pci_dev *dev);
+static int /*__devinit*/ scan_bars(struct aclpci_dev *aclpci, struct pci_dev *dev);
+static int /*__devinit*/ map_bars(struct aclpci_dev *aclpci, struct pci_dev *dev);
 static void free_bars(struct aclpci_dev *aclpci, struct pci_dev *dev);
 
 
@@ -118,7 +118,7 @@
 }
 
 /* Allocate /dev/BOARD_NAME device */
-static int __devinit init_chrdev (struct aclpci_dev *aclpci) {
+static int /*__devinit*/ init_chrdev (struct aclpci_dev *aclpci) {
 
   int dev_major =   aclpci_major; 
   int dev_minor =   aclpci_get_free();
@@ -492,7 +492,8 @@
   }
 }
 
-static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id) {
+static int /*__devinit*/ probe(struct pci_dev *dev, const struct pci_device_id *id) {
+
 
   struct aclpci_dev *aclpci = 0;
   int res;
@@ -574,7 +575,7 @@
 
 
 
-static int __devinit scan_bars(struct aclpci_dev *aclpci, struct pci_dev *dev)
+static int /*__devinit*/ scan_bars(struct aclpci_dev *aclpci, struct pci_dev *dev)
 {
   int i;
   for (i = 0; i < ACL_PCI_NUM_BARS; i++) {
@@ -595,7 +596,7 @@
  * after verifying their sizes respect the minimum sizes needed, given
  * by the bar_min_len[] array.
  */
-static int __devinit map_bars(struct aclpci_dev *aclpci, struct pci_dev *dev)
+static int /*__devinit*/ map_bars(struct aclpci_dev *aclpci, struct pci_dev *dev)
 {
   int i;
   for (i = 0; i < ACL_PCI_NUM_BARS; i++){
@@ -643,7 +644,7 @@
 }
 
 
-static void __devexit remove(struct pci_dev *dev) {
+static void /*__devexit*/ remove(struct pci_dev *dev) {
 
   struct aclpci_dev *aclpci = 0;
   ACL_DEBUG (KERN_DEBUG ": dev is %p", dev);
--- aclpci_cmd.c.orig	2017-07-28 17:11:39.987387373 +0900
+++ aclpci_cmd.c	2017-07-28 17:21:46.487337177 +0900
@@ -86,7 +86,7 @@
   case ACLPCI_CMD_LOAD_PCI_CONTROL_REGS: {
     
     pci_set_master(aclpci->pci_dev);
-    result = pci_restore_state(aclpci->pci_dev);
+    /*result = */pci_restore_state(aclpci->pci_dev);
     init_irq (aclpci->pci_dev, aclpci);
     restore_aer_on_upstream_dev(aclpci);
     retrain_gen2(aclpci);
@@ -441,7 +441,7 @@
     return -EIO;
   }
   
-  if (dev->aer_firmware_first) {
+  if (/*dev->aer_firmware_first*/ dev->__aer_firmware_first ) {
     return -EIO;
   }