PCI: move pci_find_saved_cap out of linux/pci.h
PATCH 1/1 PCI: move pci_find_saved_cap out of linux/pci.h
Only have user in driver/pci/pci.c
Don't need to put it in global pci.h
--- drivers/pci/pci.c | 19 +++++++++++++++++++ include/linux/pci.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/pci/pci.c +19 -0
@@ -825,6 +825,19 @@ EXPORT_SYMBOL(pci_choose_state);#define pcie_cap_has_sltctl2 (type, flags) \ ((flags & PCI_EXP_FLAGS_VERS) > 1) +static struct pci_cap_saved_state *pci_find_saved_cap ( +struct pci_dev *pci_dev,char cap) +{ +struct pci_cap_saved_state *tmp; +struct hlist_node *pos; + +hlist_for_each_entry (tmp, pos, &pci_dev->saved_cap_space, next) { +if (tmp->cap.cap_nr == cap) +return tmp; + } +return NULL ; +} +static int pci_save_pcie_state (struct pci_dev *dev) {int pos, i =0 ;
@@ -1869,6 +1882,12 @@ void platform_pci_wakeup_init(struct pciplatform_pci_sleep_wake (dev, false); } +static void pci_add_saved_cap (struct pci_dev *pci_dev, +struct pci_cap_saved_state *new_cap) +{ +hlist_add_head (&new_cap->next, &pci_dev->saved_cap_space); +} +/** * pci_add_save_buffer - allocate buffer for saving given capability registers * @dev: the PCI device
include/linux/pci.h +0 -19
@@ -368,25 +368,6 @@ static inline int pci_channel_offline(streturn (pdev->error_state != pci_channel_io_normal); } -static inline struct pci_cap_saved_state *pci_find_saved_cap ( -struct pci_dev *pci_dev,char cap) -{ -struct pci_cap_saved_state *tmp; -struct hlist_node *pos; - -hlist_for_each_entry (tmp, pos, &pci_dev->saved_cap_space, next) { -if (tmp->cap.cap_nr == cap) -return tmp; - } -return NULL ; -} - -static inline void pci_add_saved_cap (struct pci_dev *pci_dev, -struct pci_cap_saved_state *new_cap) -{ -hlist_add_head (&new_cap->next, &pci_dev->saved_cap_space); -} -/* * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for
Quoted 3 lines · Yinghai Lu
Only have user in
driver/pci/pci.cDon't need to put it in global
pci.h
Quoted 78 lines
Signed-off-by Yinghai Lu <[email protected].---
drivers/pci/pci.c | 19 +++++++++++++++++++
include/linux/pci.h | 19 -------------------2 files changed, 19 insertions(+), 19 deletions(-)Index:
linux-2.6/drivers/pci/pci.c
===================================================================drivers/pci/pci.c +19
-0@@ -825,6 +825,19 @@ EXPORT_SYMBOL(pci_choose_state); #define pcie_cap_has_sltctl2(type, flags) \ ((flags & PCI_EXP_FLAGS_VERS) > 1) +static struct pci_cap_saved_state *pci_find_saved_cap ( + struct pci_dev *pci_dev, char cap) +{ + struct pci_cap_saved_state *tmp; + struct hlist_node *pos; + + hlist_for_each_entry(tmp, pos, &pci_dev->saved_cap_space, next) { + if (tmp->cap.cap_nr == cap) + return tmp; + } + return NULL; +} + static int pci_save_pcie_state(struct pci_dev *dev) { int pos, i = 0;@@ -1869,6 +1882,12 @@ void platform_pci_wakeup_init(struct pci platform_pci_sleep_wake(dev, false); } +static void pci_add_saved_cap (struct pci_dev *pci_dev, + struct pci_cap_saved_state *new_cap) +{ + hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space); +} + /*** pci_add_save_buffer - allocate buffer for saving given capability registers * @dev: the PCI device Index:
linux-2.6/include/linux/pci.h
===================================================================include/linux/pci.h +0
-20@@ -368,25 +368,6 @@ static inline int pci_channel_offline(st return (pdev->error_state != pci_channel_io_normal); } -static inline struct pci_cap_saved_state *pci_find_saved_cap ( - struct pci_dev *pci_dev, char cap) -{ - struct pci_cap_saved_state *tmp; - struct hlist_node *pos; - - hlist_for_each_entry(tmp, pos, &pci_dev->saved_cap_space, next) { - if (tmp->cap.cap_nr == cap) - return tmp; - } - return NULL; -} - -static inline void pci_add_saved_cap (struct pci_dev *pci_dev, - struct pci_cap_saved_state *new_cap) -{ - hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space); -} - /** The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond * to P2P or CardBus bridge windows) go in a table. Additional ones (for -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jesse Barnes
AppliedQuoted 5 lines · On Sat, 11 Feb 2012 00:18:41 -0800 Yinghai Lu <[email protected]> wrote:
Only have user in
driver/pci/pci.cDon't need to put it in global
pci.hSigned-off-by Yinghai Lu <[email protected].
Applied, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center