summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-qcom-qspi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/spi-qcom-qspi.c')
-rw-r--r--drivers/spi/spi-qcom-qspi.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index e0f061139c8f..250fd60e1678 100644
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -424,7 +424,6 @@ static int qcom_qspi_probe(struct platform_device *pdev)
424{ 424{
425 int ret; 425 int ret;
426 struct device *dev; 426 struct device *dev;
427 struct resource *res;
428 struct spi_master *master; 427 struct spi_master *master;
429 struct qcom_qspi *ctrl; 428 struct qcom_qspi *ctrl;
430 429
@@ -440,8 +439,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
440 439
441 spin_lock_init(&ctrl->lock); 440 spin_lock_init(&ctrl->lock);
442 ctrl->dev = dev; 441 ctrl->dev = dev;
443 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 442 ctrl->base = devm_platform_ioremap_resource(pdev, 0);
444 ctrl->base = devm_ioremap_resource(dev, res);
445 if (IS_ERR(ctrl->base)) { 443 if (IS_ERR(ctrl->base)) {
446 ret = PTR_ERR(ctrl->base); 444 ret = PTR_ERR(ctrl->base);
447 goto exit_probe_master_put; 445 goto exit_probe_master_put;
@@ -454,10 +452,8 @@ static int qcom_qspi_probe(struct platform_device *pdev)
454 goto exit_probe_master_put; 452 goto exit_probe_master_put;
455 453
456 ret = platform_get_irq(pdev, 0); 454 ret = platform_get_irq(pdev, 0);
457 if (ret < 0) { 455 if (ret < 0)
458 dev_err(dev, "Failed to get irq %d\n", ret);
459 goto exit_probe_master_put; 456 goto exit_probe_master_put;
460 }
461 ret = devm_request_irq(dev, ret, qcom_qspi_irq, 457 ret = devm_request_irq(dev, ret, qcom_qspi_irq,
462 IRQF_TRIGGER_HIGH, dev_name(dev), ctrl); 458 IRQF_TRIGGER_HIGH, dev_name(dev), ctrl);
463 if (ret) { 459 if (ret) {