Cleanup of PCIE-Portbus

@@ -30,23 +30,6 @@
  /* global data */
  static const char device_name[] = "pcieport-driver";
 
-static int pcie_portdrv_save_config(struct pci_dev *dev)
-{
-	return pci_save_state(dev);
-}
-
-static int pcie_portdrv_restore_config(struct pci_dev *dev)
-{
-	int retval;
-
-	pci_restore_state(dev);
-	retval = pci_enable_device(dev);
-	if (retval)
-		return retval;
-	pci_set_master(dev);
-	return 0;
-}
-
  /*
   * pcie_portdrv_probe - Probe PCI-Express port devices
   * @dev: PCI-Express port device being probed

@@ -86,6 +69,23 @@
  }
 
  #ifdef CONFIG_PM
+static int pcie_portdrv_save_config(struct pci_dev *dev)
+{
+	return pci_save_state(dev);
+}
+
+static int pcie_portdrv_restore_config(struct pci_dev *dev)
+{
+	int retval;
+
+	pci_restore_state(dev);
+	retval = pci_enable_device(dev);
+	if (retval)
+		return retval;
+	pci_set_master(dev);
+	return 0;
+}
+
  static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
  {
  	int ret = pcie_port_device_suspend(dev, state);

@@ -105,7 +105,7 @@
  /*
   * LINUX Device Driver Model
   */
-static const struct pci_device_id port_pci_ids[] = { {
+static const struct pci_device_id port_pci_ids[] __devinitdata = { {
  	/* handle any PCI-Express port */
  	PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0),
  	}, { /* end: all zeroes */ }