Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4faad26c authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 8e37befc de0fa83c

drivers/spi/spi-bcm63xx.c

+1 −7
Original line number Diff line number Diff line
@@ -360,13 +360,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	struct bcm63xx_spi *bs;

	int ret;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r) {

		dev_err(dev, "no iomem\n");

		ret = -ENXIO;

		goto out;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "no irq\n");
@@ -393,6 +386,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, master);

	bs->pdev = pdev;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	bs->regs = devm_ioremap_resource(&pdev->dev, r);

	if (IS_ERR(bs->regs)) {

		ret = PTR_ERR(bs->regs);

drivers/spi/spi-bfin-v3.c

+1 −7
Original line number Diff line number Diff line
@@ -792,13 +792,6 @@ static int bfin_spi_probe(struct platform_device *pdev) 
		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 @@ static int bfin_spi_probe(struct platform_device *pdev) 
	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);