OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi-5.3' into spi-5.4
[tomoyo/tomoyo-test1.git]
/
drivers
/
spi
/
spi-zynq-qspi.c
diff --git
a/drivers/spi/spi-zynq-qspi.c
b/drivers/spi/spi-zynq-qspi.c
index
3155e2c
..
4a5326c
100644
(file)
--- a/
drivers/spi/spi-zynq-qspi.c
+++ b/
drivers/spi/spi-zynq-qspi.c
@@
-694,7
+694,7
@@
static int zynq_qspi_probe(struct platform_device *pdev)
ctlr->setup = zynq_qspi_setup_op;
ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2;
ctlr->dev.of_node = np;
ctlr->setup = zynq_qspi_setup_op;
ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2;
ctlr->dev.of_node = np;
- ret =
spi_register_controller(
ctlr);
+ ret =
devm_spi_register_controller(&pdev->dev,
ctlr);
if (ret) {
dev_err(&pdev->dev, "spi_register_master failed\n");
goto clk_dis_all;
if (ret) {
dev_err(&pdev->dev, "spi_register_master failed\n");
goto clk_dis_all;