Merge remote-tracking branch 'spi/topic/ioremap' into spi-next

diff --combined drivers/spi/spi-bfin-v3.c
index 914f9fe1ec9952a26ce4b8ce75ff6ad34431e902,d5bab00f190b391dee1dd6b52a5a3e7c2920f87a..e4394ebf08f385f9af9d32c037c9bbc0711d3f8c
--- 1/drivers/spi/spi-bfin-v3.c
--- 2/drivers/spi/spi-bfin-v3.c
+++ b/drivers/spi/spi-bfin-v3.c
@@@ -792,13 -792,6 +792,6 @@@ static int bfin_spi_probe(struct platfo
                return -ENXIO;
        }
  
-       /* get register base and tx/rx dma */
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem) {
-               dev_err(dev, "can not get register base\n");
-               return -ENXIO;
-       }
- 
        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
        if (!res) {
                dev_err(dev, "can not get tx dma resource\n");
@@@ -838,6 -831,7 +831,7 @@@
        drv_data->pin_req = info->pin_req;
        drv_data->sclk = sclk;
  
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        drv_data->regs = devm_ioremap_resource(dev, mem);
        if (IS_ERR(drv_data->regs)) {
                ret = PTR_ERR(drv_data->regs);
@@@ -888,6 -882,7 +882,6 @@@ err_free_rx_dma
  err_free_tx_dma:
        free_dma(tx_dma);
  err_put_master:
 -      platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
  
        return ret;
@@@ -904,6 -899,7 +898,6 @@@ static int bfin_spi_remove(struct platf
        free_dma(drv_data->rx_dma);
        free_dma(drv_data->tx_dma);
  
 -      platform_set_drvdata(pdev, NULL);
        spi_unregister_master(drv_data->master);
        return 0;
  }