[KJ] [PATCH] Cleanup of portdrv_pci.c

[KJ] [PATCH] Cleanup of portdrv_pci.c

[Henne]

From: Henrik Kretzschmar <henne@nachtwindheim.de>

Marking the pci_device_id table of portdrv_pci.c as __devinitdata and
making save/resore_config() dependend tp CONFIG_PM
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---

--- linux-2.6.17-rc2/drivers/pci/pcie/portdrv_pci.c	2006-04-24 
13:31:00.000000000 +0200
+++ linux_test/drivers/pci/pcie/portdrv_pci.c	2006-04-24 
18:20:29.000000000 +0200
@@ -30,6 +30,7 @@
  /* global data */
  static const char device_name[] = "pcieport-driver";

+#ifdef CONFIG_PM
  static int pcie_portdrv_save_config(struct pci_dev *dev)
  {
  	return pci_save_state(dev);
@@ -46,7 +47,7 @@
  	pci_set_master(dev);
  	return 0;
  }
-
+#endif /* CONFIG_PM */
  /*
   * pcie_portdrv_probe - Probe PCI-Express port devices
   * @dev: PCI-Express port device being probed
@@ -105,7 +106,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 */ }
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] Cleanup of portdrv_pci.c

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 678 bytes --]

On Mon, Apr 24, 2006 at 06:28:29PM +0200, Henne wrote:
> From: Henrik Kretzschmar <henne@nachtwindheim.de>
> 
> Marking the pci_device_id table of portdrv_pci.c as __devinitdata and
> making save/resore_config() dependend tp CONFIG_PM
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
> ---
> 
> --- linux-2.6.17-rc2/drivers/pci/pcie/portdrv_pci.c	2006-04-24 
> 13:31:00.000000000 +0200
> +++ linux_test/drivers/pci/pcie/portdrv_pci.c	2006-04-24 
> 18:20:29.000000000 +0200
> @@ -30,6 +30,7 @@
>  /* global data */
>  static const char device_name[] = "pcieport-driver";
> 
> +#ifdef CONFIG_PM

No, please no ifdefs in .c files if you can help it.

thanks,

greg k-h

[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors