File tree Expand file tree Collapse file tree 1 file changed +4
-7
lines changed
drivers/net/ethernet/marvell Expand file tree Collapse file tree 1 file changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -348,13 +348,12 @@ static int orion_mdio_probe(struct platform_device *pdev)
348
348
if (type == BUS_TYPE_XSMI )
349
349
orion_mdio_xsmi_set_mdc_freq (bus );
350
350
} else {
351
- dev -> clk [0 ] = clk_get (& pdev -> dev , NULL );
352
- if (PTR_ERR (dev -> clk [0 ]) == - EPROBE_DEFER ) {
353
- ret = - EPROBE_DEFER ;
351
+ dev -> clk [0 ] = clk_get_optional (& pdev -> dev , NULL );
352
+ if (IS_ERR (dev -> clk [0 ])) {
353
+ ret = PTR_ERR ( dev -> clk [ 0 ]) ;
354
354
goto out_clk ;
355
355
}
356
- if (!IS_ERR (dev -> clk [0 ]))
357
- clk_prepare_enable (dev -> clk [0 ]);
356
+ clk_prepare_enable (dev -> clk [0 ]);
358
357
}
359
358
360
359
@@ -422,8 +421,6 @@ static void orion_mdio_remove(struct platform_device *pdev)
422
421
mdiobus_unregister (bus );
423
422
424
423
for (i = 0 ; i < ARRAY_SIZE (dev -> clk ); i ++ ) {
425
- if (IS_ERR (dev -> clk [i ]))
426
- break ;
427
424
clk_disable_unprepare (dev -> clk [i ]);
428
425
clk_put (dev -> clk [i ]);
429
426
}
You can’t perform that action at this time.
0 commit comments