@@ -54,8 +54,6 @@ struct mpc512x_psc_spi {
5454 struct mpc512x_psc_fifo __iomem * fifo ;
5555 unsigned int irq ;
5656 u8 bits_per_word ;
57- struct clk * clk_mclk ;
58- struct clk * clk_ipg ;
5957 u32 mclk_rate ;
6058
6159 struct completion txisrdone ;
@@ -499,25 +497,15 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev)
499497 return ret ;
500498 init_completion (& mps -> txisrdone );
501499
502- clk = devm_clk_get (dev , "mclk" );
500+ clk = devm_clk_get_enabled (dev , "mclk" );
503501 if (IS_ERR (clk ))
504502 return PTR_ERR (clk );
505503
506- ret = clk_prepare_enable (clk );
507- if (ret )
508- return ret ;
509- mps -> clk_mclk = clk ;
510504 mps -> mclk_rate = clk_get_rate (clk );
511505
512- clk = devm_clk_get (dev , "ipg" );
513- if (IS_ERR (clk )) {
514- ret = PTR_ERR (clk );
515- goto free_mclk_clock ;
516- }
517- ret = clk_prepare_enable (clk );
518- if (ret )
519- goto free_mclk_clock ;
520- mps -> clk_ipg = clk ;
506+ clk = devm_clk_get_enabled (dev , "ipg" );
507+ if (IS_ERR (clk ))
508+ return PTR_ERR (clk );
521509
522510 ret = mpc512x_psc_spi_port_config (master , mps );
523511 if (ret < 0 )
@@ -528,24 +516,6 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev)
528516 goto free_ipg_clock ;
529517
530518 return ret ;
531-
532- free_ipg_clock :
533- clk_disable_unprepare (mps -> clk_ipg );
534- free_mclk_clock :
535- clk_disable_unprepare (mps -> clk_mclk );
536-
537- return ret ;
538- }
539-
540- static int mpc512x_psc_spi_of_remove (struct platform_device * pdev )
541- {
542- struct spi_master * master = dev_get_drvdata (& pdev -> dev );
543- struct mpc512x_psc_spi * mps = spi_master_get_devdata (master );
544-
545- clk_disable_unprepare (mps -> clk_mclk );
546- clk_disable_unprepare (mps -> clk_ipg );
547-
548- return 0 ;
549519}
550520
551521static const struct of_device_id mpc512x_psc_spi_of_match [] = {
@@ -558,7 +528,6 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);
558528
559529static struct platform_driver mpc512x_psc_spi_of_driver = {
560530 .probe = mpc512x_psc_spi_of_probe ,
561- .remove = mpc512x_psc_spi_of_remove ,
562531 .driver = {
563532 .name = "mpc512x-psc-spi" ,
564533 .of_match_table = mpc512x_psc_spi_of_match ,
0 commit comments