aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-10-26 10:25:27 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-26 10:25:27 -0700
commit0b96668577ee71432504df9094baf9a7117371de (patch)
tree3a13fbf2dfcfc7f3baf86703e14f3ee8ede438aa /pci
parent2d19c24f5f5ac81213cac52bd0b631b1ce493f89 (diff)
downloadpatches-0b96668577ee71432504df9094baf9a7117371de.tar.gz
new usb patches
Diffstat (limited to 'pci')
-rw-r--r--pci/kernel-doc-fix-pci-hotplug.patch30
-rw-r--r--pci/kernel-doc-pci-fixes.patch112
2 files changed, 142 insertions, 0 deletions
diff --git a/pci/kernel-doc-fix-pci-hotplug.patch b/pci/kernel-doc-fix-pci-hotplug.patch
new file mode 100644
index 0000000000000..10d9cfa992b78
--- /dev/null
+++ b/pci/kernel-doc-fix-pci-hotplug.patch
@@ -0,0 +1,30 @@
+From rdunlap@xenotime.net Sun Oct 23 12:47:06 2005
+Date: Sun, 23 Oct 2005 11:58:19 -0700
+From: "Randy.Dunlap" <rdunlap@xenotime.net>
+Cc: gregkh <greg@kroah.com>
+Subject: [PATCH] kernel-doc: fix PCI hotplug
+Message-Id: <20051023115819.2755f13d.rdunlap@xenotime.net>
+
+From: Randy Dunlap <rdunlap@xenotime.net>
+
+PCI hotplug.c: does not contain kernel-doc, so don't process it for now.
+
+Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ Documentation/DocBook/kernel-api.tmpl | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/Documentation/DocBook/kernel-api.tmpl
++++ gregkh-2.6/Documentation/DocBook/kernel-api.tmpl
+@@ -286,7 +286,9 @@ X!Edrivers/pci/search.c
+ -->
+ !Edrivers/pci/msi.c
+ !Edrivers/pci/bus.c
+-!Edrivers/pci/hotplug.c
++<!-- FIXME: Removed for now since no structured comments in source
++X!Edrivers/pci/hotplug.c
++-->
+ !Edrivers/pci/probe.c
+ !Edrivers/pci/rom.c
+ </sect1>
diff --git a/pci/kernel-doc-pci-fixes.patch b/pci/kernel-doc-pci-fixes.patch
new file mode 100644
index 0000000000000..1e9aba1e28e35
--- /dev/null
+++ b/pci/kernel-doc-pci-fixes.patch
@@ -0,0 +1,112 @@
+From rdunlap@xenotime.net Sun Oct 23 12:46:59 2005
+Date: Sun, 23 Oct 2005 11:57:38 -0700
+From: "Randy.Dunlap" <rdunlap@xenotime.net>
+Cc: gregkh <greg@kroah.com>
+Subject: [PATCH] kernel-doc: PCI fixes
+Message-Id: <20051023115738.40b68e9f.rdunlap@xenotime.net>
+
+From: Randy Dunlap <rdunlap@xenotime.net>
+
+PCI: add descriptions for missing function parameters.
+Eliminate all kernel-doc warnings here.
+
+Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/pci/msi.c | 2 ++
+ drivers/pci/pci-driver.c | 13 +++++++++----
+ drivers/pci/pci.c | 7 ++++---
+ drivers/pci/probe.c | 1 +
+ 4 files changed, 16 insertions(+), 7 deletions(-)
+
+--- gregkh-2.6.orig/drivers/pci/probe.c
++++ gregkh-2.6/drivers/pci/probe.c
+@@ -683,6 +683,7 @@ static void pci_release_dev(struct devic
+
+ /**
+ * pci_cfg_space_size - get the configuration space size of the PCI device.
++ * @dev: PCI device
+ *
+ * Regular PCI devices have 256 bytes, but PCI-X 2 and PCI Express devices
+ * have 4096 bytes. Even if the device is capable, that doesn't mean we can
+--- gregkh-2.6.orig/drivers/pci/msi.c
++++ gregkh-2.6/drivers/pci/msi.c
+@@ -575,6 +575,8 @@ static int msi_capability_init(struct pc
+ /**
+ * msix_capability_init - configure device's MSI-X capability
+ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ * @entries: pointer to an array of struct msix_entry entries
++ * @nvec: number of @entries
+ *
+ * Setup the MSI-X capability structure of device function with a
+ * single MSI-X vector. A return of zero indicates the successful setup of
+--- gregkh-2.6.orig/drivers/pci/pci.c
++++ gregkh-2.6/drivers/pci/pci.c
+@@ -252,6 +252,8 @@ pci_restore_bars(struct pci_dev *dev)
+ pci_update_resource(dev, &dev->resource[i], i);
+ }
+
++int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t);
++
+ /**
+ * pci_set_power_state - Set the power state of a PCI device
+ * @dev: PCI device to be suspended
+@@ -266,7 +268,6 @@ pci_restore_bars(struct pci_dev *dev)
+ * -EIO if device does not support PCI PM.
+ * 0 if we can successfully change the power state.
+ */
+-int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t);
+ int
+ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
+ {
+@@ -812,8 +813,8 @@ pci_clear_mwi(struct pci_dev *dev)
+
+ /**
+ * pci_intx - enables/disables PCI INTx for device dev
+- * @dev: the PCI device to operate on
+- * @enable: boolean
++ * @pdev: the PCI device to operate on
++ * @enable: boolean: whether to enable or disable PCI INTx
+ *
+ * Enables/disables PCI INTx for device dev
+ */
+--- gregkh-2.6.orig/drivers/pci/pci-driver.c
++++ gregkh-2.6/drivers/pci/pci-driver.c
+@@ -26,7 +26,10 @@ struct pci_dynid {
+ #ifdef CONFIG_HOTPLUG
+
+ /**
+- * store_new_id
++ * store_new_id - add a new PCI device ID to this driver and re-probe devices
++ * @driver: target device driver
++ * @buf: buffer for scanning device ID data
++ * @count: input size
+ *
+ * Adds a new dynamic pci device ID to this driver,
+ * and causes the driver to probe for all devices again.
+@@ -194,8 +197,10 @@ static int pci_call_probe(struct pci_dri
+
+ /**
+ * __pci_device_probe()
++ * @drv: driver to call to check if it wants the PCI device
++ * @pci_dev: PCI device being probed
+ *
+- * returns 0 on success, else error.
++ * returns 0 on success, else error.
+ * side-effect: pci_dev->driver is set to drv when drv claims pci_dev.
+ */
+ static int
+@@ -440,11 +445,11 @@ pci_dev_driver(const struct pci_dev *dev
+
+ /**
+ * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure
+- * @ids: array of PCI device id structures to search in
+ * @dev: the PCI device structure to match against
++ * @drv: the device driver to search for matching PCI device id structures
+ *
+ * Used by a driver to check whether a PCI device present in the
+- * system is in its list of supported devices.Returns the matching
++ * system is in its list of supported devices. Returns the matching
+ * pci_device_id structure or %NULL if there is no match.
+ */
+ static int pci_bus_match(struct device *dev, struct device_driver *drv)