dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 10:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

dm: pci: Move pci_bus_to_hose() to compatibility

Browse Source 
This function should not be used by driver-model code, so move it to the
compatibility portion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2016-01-18 20:19:14 -07:00
committed by Bin Meng
parent 12f229ea8f
commit a6eb93b321
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/pci-uclass.c
View File

@@ -22,7 +22,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static int pci_get_bus(int busnum, struct udevice **busp) int pci_get_bus(int busnum, struct udevice **busp)
{ {
int ret; int ret;
@@ -41,20 +41,6 @@ static int pci_get_bus(int busnum, struct udevice **busp)
return ret; return ret;
} }
struct pci_controller *pci_bus_to_hose(int busnum)
{
struct udevice *bus;
int ret;
ret = pci_get_bus(busnum, &bus);
if (ret) {
debug("%s: Cannot get bus %d: ret=%d\n", __func__, busnum, ret);
return NULL;
}
return dev_get_uclass_priv(bus);
}
struct udevice *pci_get_controller(struct udevice *dev) struct udevice *pci_get_controller(struct udevice *dev)
{ {
while (device_is_on_pci_bus(dev)) while (device_is_on_pci_bus(dev))

15
drivers/pci/pci_compat.c
View File

@@ -12,6 +12,7 @@
#include <pci.h> #include <pci.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/lists.h> #include <dm/lists.h>
#include "pci_internal.h"
#define PCI_HOSE_OP(rw, name, size, type) \ #define PCI_HOSE_OP(rw, name, size, type) \
int pci_hose_##rw##_config_##name(struct pci_controller *hose, \ int pci_hose_##rw##_config_##name(struct pci_controller *hose, \
@@ -36,3 +37,17 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
return -1; return -1;
return dm_pci_get_bdf(dev); return dm_pci_get_bdf(dev);
} }
struct pci_controller *pci_bus_to_hose(int busnum)
{
struct udevice *bus;
int ret;
ret = pci_get_bus(busnum, &bus);
if (ret) {
debug("%s: Cannot get bus %d: ret=%d\n", __func__, busnum, ret);
return NULL;
}
return dev_get_uclass_priv(bus);
}

12
drivers/pci/pci_internal.h
View File

@@ -47,4 +47,16 @@ void dm_pciauto_postscan_setup_bridge(struct udevice *dev, int sub_bus);
*/ */
int dm_pciauto_config_device(struct udevice *dev); int dm_pciauto_config_device(struct udevice *dev);
/**
* pci_get_bus() - Get a pointer to a bus, given its number
*
* This looks up a PCI bus based on its bus number. The bus is probed if
* necessary.
*
* @busnum: PCI bus number to look up
* @busp: Returns PCI bus on success
* @return 0 on success, or -ve error
*/
int pci_get_bus(int busnum, struct udevice **busp);
#endif #endif