X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fpci%2Fpci-uclass.c;h=6093072814a5bfb44a7fb09ac5b5e149b48c3f1a;hb=41575d8e4c334df148c4cdd7c40cc825dc0fcaa1;hp=d8a6647a1da9c47a1e24f46ffc12bd14125189c7;hpb=9f9ecd3e4d7839e24c182fb7b24937e19b670f1b;p=platform%2Fkernel%2Fu-boot.git

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index d8a6647..6093072 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -750,8 +750,8 @@ static int pci_find_and_bind_driver(struct udevice *parent,
 			 * find another driver. For now this doesn't seem
 			 * necesssary, so just bind the first match.
 			 */
-			ret = device_bind_ofnode(parent, drv, drv->name, NULL,
-						 node, &dev);
+			ret = device_bind(parent, drv, drv->name, NULL, node,
+					  &dev);
 			if (ret)
 				goto error;
 			debug("%s: Match found: %s\n", __func__, drv->name);
@@ -911,8 +911,8 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
 			   ofnode node)
 {
 	int pci_addr_cells, addr_cells, size_cells;
-	struct bd_info *bd = gd->bd;
 	int cells_per_record;
+	struct bd_info *bd;
 	const u32 *prop;
 	int max_regions;
 	int len;
@@ -989,6 +989,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,
 	}
 
 	/* Add a region for our local memory */
+	bd = gd->bd;
 	if (!bd)
 		return;
 
@@ -1795,8 +1796,8 @@ UCLASS_DRIVER(pci) = {
 	.pre_probe	= pci_uclass_pre_probe,
 	.post_probe	= pci_uclass_post_probe,
 	.child_post_bind = pci_uclass_child_post_bind,
-	.per_device_auto_alloc_size = sizeof(struct pci_controller),
-	.per_child_platdata_auto_alloc_size =
+	.per_device_auto	= sizeof(struct pci_controller),
+	.per_child_platdata_auto	=
 			sizeof(struct pci_child_platdata),
 };