|
@@ -534,7 +534,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
|
|
|
if (ret < 0)
|
|
|
goto free_clock;
|
|
|
|
|
|
- ret = spi_register_master(master);
|
|
|
+ ret = devm_spi_register_master(dev, master);
|
|
|
if (ret < 0)
|
|
|
goto free_clock;
|
|
|
|
|
@@ -557,12 +557,10 @@ static int mpc512x_psc_spi_do_remove(struct device *dev)
|
|
|
struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
|
|
|
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
|
|
|
|
|
|
- spi_unregister_master(master);
|
|
|
clk_disable_unprepare(mps->clk_mclk);
|
|
|
free_irq(mps->irq, mps);
|
|
|
if (mps->psc)
|
|
|
iounmap(mps->psc);
|
|
|
- spi_master_put(master);
|
|
|
|
|
|
return 0;
|
|
|
}
|