mirror of
https://xff.cz/git/u-boot/
synced 2025-09-30 15:01:27 +02:00
usb: ohci: ohci-da8xx: Cleanup Error handling and fix flags
Per feedback from Marek, he suggested better handling and to enable DM_FLAG_OS_PREPARE, this patch re-orders some of the error checking, and errors returns the error code right away and also sets DM_FLAG_OS_PREPARE. Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
@@ -93,6 +93,10 @@ static int ohci_da8xx_probe(struct udevice *dev)
|
|||||||
err = 0;
|
err = 0;
|
||||||
priv->clock_count = 0;
|
priv->clock_count = 0;
|
||||||
clock_nb = dev_count_phandle_with_args(dev, "clocks", "#clock-cells");
|
clock_nb = dev_count_phandle_with_args(dev, "clocks", "#clock-cells");
|
||||||
|
|
||||||
|
if (clock_nb < 0)
|
||||||
|
return clock_nb;
|
||||||
|
|
||||||
if (clock_nb > 0) {
|
if (clock_nb > 0) {
|
||||||
priv->clocks = devm_kcalloc(dev, clock_nb, sizeof(struct clk),
|
priv->clocks = devm_kcalloc(dev, clock_nb, sizeof(struct clk),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
@@ -112,9 +116,6 @@ static int ohci_da8xx_probe(struct udevice *dev)
|
|||||||
}
|
}
|
||||||
priv->clock_count++;
|
priv->clock_count++;
|
||||||
}
|
}
|
||||||
} else if (clock_nb != -ENOENT) {
|
|
||||||
dev_err(dev, "failed to get clock phandle(%d)\n", clock_nb);
|
|
||||||
return clock_nb;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err = usb_cpu_init();
|
err = usb_cpu_init();
|
||||||
@@ -170,6 +171,6 @@ U_BOOT_DRIVER(ohci_generic) = {
|
|||||||
.remove = ohci_da8xx_remove,
|
.remove = ohci_da8xx_remove,
|
||||||
.ops = &ohci_usb_ops,
|
.ops = &ohci_usb_ops,
|
||||||
.priv_auto_alloc_size = sizeof(struct da8xx_ohci),
|
.priv_auto_alloc_size = sizeof(struct da8xx_ohci),
|
||||||
.flags = DM_FLAG_ALLOC_PRIV_DMA,
|
.flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user