"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "drivers/net/ethernet/marvell/mvmdio.c" between
linux-5.3-rc3.tar.gz and linux-5.3-rc4.tar.gz

About: The full source of the development Linux kernel 5.3 (release candidate).

mvmdio.c  (linux-5.3-rc3):mvmdio.c  (linux-5.3-rc4)
skipping to change at line 322 skipping to change at line 322
dev = bus->priv; dev = bus->priv;
dev->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r)); dev->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!dev->regs) { if (!dev->regs) {
dev_err(&pdev->dev, "Unable to remap SMI register\n"); dev_err(&pdev->dev, "Unable to remap SMI register\n");
return -ENODEV; return -ENODEV;
} }
init_waitqueue_head(&dev->smi_busy_wait); init_waitqueue_head(&dev->smi_busy_wait);
for (i = 0; i < ARRAY_SIZE(dev->clk); i++) { if (pdev->dev.of_node) {
dev->clk[i] = of_clk_get(pdev->dev.of_node, i); for (i = 0; i < ARRAY_SIZE(dev->clk); i++) {
if (PTR_ERR(dev->clk[i]) == -EPROBE_DEFER) { dev->clk[i] = of_clk_get(pdev->dev.of_node, i);
if (PTR_ERR(dev->clk[i]) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER;
goto out_clk;
}
if (IS_ERR(dev->clk[i]))
break;
clk_prepare_enable(dev->clk[i]);
}
if (!IS_ERR(of_clk_get(pdev->dev.of_node,
ARRAY_SIZE(dev->clk))))
dev_warn(&pdev->dev,
"unsupported number of clocks, limiting to the f
irst "
__stringify(ARRAY_SIZE(dev->clk)) "\n");
} else {
dev->clk[0] = clk_get(&pdev->dev, NULL);
if (PTR_ERR(dev->clk[0]) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto out_clk; goto out_clk;
} }
if (IS_ERR(dev->clk[i])) if (!IS_ERR(dev->clk[0]))
break; clk_prepare_enable(dev->clk[0]);
clk_prepare_enable(dev->clk[i]);
} }
if (!IS_ERR(of_clk_get(pdev->dev.of_node, ARRAY_SIZE(dev->clk))))
dev_warn(&pdev->dev, "unsupported number of clocks, limiting to t
he first "
__stringify(ARRAY_SIZE(dev->clk)) "\n");
dev->err_interrupt = platform_get_irq(pdev, 0); dev->err_interrupt = platform_get_irq(pdev, 0);
if (dev->err_interrupt > 0 && if (dev->err_interrupt > 0 &&
resource_size(r) < MVMDIO_ERR_INT_MASK + 4) { resource_size(r) < MVMDIO_ERR_INT_MASK + 4) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"disabling interrupt, resource size is too small\n"); "disabling interrupt, resource size is too small\n");
dev->err_interrupt = 0; dev->err_interrupt = 0;
} }
if (dev->err_interrupt > 0) { if (dev->err_interrupt > 0) {
ret = devm_request_irq(&pdev->dev, dev->err_interrupt, ret = devm_request_irq(&pdev->dev, dev->err_interrupt,
orion_mdio_err_irq, orion_mdio_err_irq,
 End of changes. 3 change blocks. 
11 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)