|
@@ -2225,7 +2225,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
|
|
|
|
|
|
/* Register with the SPI framework */
|
|
|
amba_set_drvdata(adev, pl022);
|
|
|
- status = spi_register_master(master);
|
|
|
+ status = devm_spi_register_master(&adev->dev, master);
|
|
|
if (status != 0) {
|
|
|
dev_err(&adev->dev,
|
|
|
"probe - problem registering spi master\n");
|
|
@@ -2285,7 +2285,6 @@ pl022_remove(struct amba_device *adev)
|
|
|
clk_unprepare(pl022->clk);
|
|
|
amba_release_regions(adev);
|
|
|
tasklet_disable(&pl022->pump_transfers);
|
|
|
- spi_unregister_master(pl022->master);
|
|
|
return 0;
|
|
|
}
|
|
|
|