From 84e8e453c820aee0964a8825e08632fcbbae31a4 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 7 Jun 2010 17:12:57 +0000 Subject: [PATCH] Remove the rest of cardbus_scan_bus. Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5620 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/device/cardbus.h | 3 --- src/southbridge/ricoh/rl5c476/rl5c476.c | 2 +- src/southbridge/ti/pci7420/pci7420_cardbus.c | 2 +- src/southbridge/ti/pcixx12/pcixx12.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/include/device/cardbus.h b/src/include/device/cardbus.h index 5b003d3217..c48a19be25 100644 --- a/src/include/device/cardbus.h +++ b/src/include/device/cardbus.h @@ -3,9 +3,6 @@ /* (c) 2005 Linux Networx GPL see COPYING for details */ void cardbus_read_resources(device_t dev); -unsigned int cardbus_scan_bus(struct bus *bus, - unsigned min_devfn, unsigned max_devfn, unsigned int max); -unsigned int cardbus_scan_bridge(device_t dev, unsigned int max); void cardbus_enable_resources(device_t dev); extern struct device_operations default_cardbus_ops_bus; diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index 70d74f5fab..0c8916b742 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -203,7 +203,7 @@ static struct device_operations ricoh_rl5c476_ops = { .set_resources = rl5c476_set_resources, .enable_resources = cardbus_enable_resources, .init = rl5c476_init, - .scan_bus = cardbus_scan_bridge, + .scan_bus = pci_scan_bridge, }; static const struct pci_driver ricoh_rl5c476_driver __pci_driver = { diff --git a/src/southbridge/ti/pci7420/pci7420_cardbus.c b/src/southbridge/ti/pci7420/pci7420_cardbus.c index 4814d97707..2ab383b511 100644 --- a/src/southbridge/ti/pci7420/pci7420_cardbus.c +++ b/src/southbridge/ti/pci7420/pci7420_cardbus.c @@ -102,7 +102,7 @@ static struct device_operations ti_pci7420_ops = { .set_resources = pci7420_cardbus_set_resources, .enable_resources = cardbus_enable_resources, .init = pci7420_cardbus_init, - .scan_bus = cardbus_scan_bridge, + .scan_bus = pci_scan_bridge, }; static const struct pci_driver ti_pci7420_driver __pci_driver = { diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c index 782face3b6..5e9b77fa8d 100644 --- a/src/southbridge/ti/pcixx12/pcixx12.c +++ b/src/southbridge/ti/pcixx12/pcixx12.c @@ -52,7 +52,7 @@ static struct device_operations ti_pcixx12_ops = { .set_resources = pcixx12_set_resources, .enable_resources = cardbus_enable_resources, .init = pcixx12_init, - .scan_bus = cardbus_scan_bridge, + .scan_bus = pci_scan_bridge, }; static const struct pci_driver ti_pcixx12_driver __pci_driver = {