diff options
Diffstat (limited to 'drivers/spi/spi-qcom-qspi.c')
| -rw-r--r-- | drivers/spi/spi-qcom-qspi.c | 8 | 
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)  {  	int ret;  	struct device *dev; -	struct resource *res;  	struct spi_master *master;  	struct qcom_qspi *ctrl; @@ -440,8 +439,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)  	spin_lock_init(&ctrl->lock);  	ctrl->dev = dev; -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	ctrl->base = devm_ioremap_resource(dev, res); +	ctrl->base = devm_platform_ioremap_resource(pdev, 0);  	if (IS_ERR(ctrl->base)) {  		ret = PTR_ERR(ctrl->base);  		goto exit_probe_master_put; @@ -454,10 +452,8 @@ static int qcom_qspi_probe(struct platform_device *pdev)  		goto exit_probe_master_put;  	ret = platform_get_irq(pdev, 0); -	if (ret < 0) { -		dev_err(dev, "Failed to get irq %d\n", ret); +	if (ret < 0)  		goto exit_probe_master_put; -	}  	ret = devm_request_irq(dev, ret, qcom_qspi_irq,  			IRQF_TRIGGER_HIGH, dev_name(dev), ctrl);  	if (ret) {  |