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

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

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

parents f24b19cb e0045ebf

drivers/spi/spi-dw-mmio.c

+1 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) 
	dwsmmio->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(dwsmmio->clk)) {

		ret = PTR_ERR(dwsmmio->clk);

		goto err_irq;

		goto err_unmap;

	}

	clk_enable(dwsmmio->clk);
@@ -94,8 +94,6 @@ err_clk: 
	clk_disable(dwsmmio->clk);

	clk_put(dwsmmio->clk);

	dwsmmio->clk = NULL;

err_irq:

	free_irq(dws->irq, dws);

err_unmap:

	iounmap(dws->regs);

err_release_reg:
@@ -115,7 +113,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) 
	clk_put(dwsmmio->clk);

	dwsmmio->clk = NULL;



	free_irq(dwsmmio->dws.irq, &dwsmmio->dws);

	dw_spi_remove_host(&dwsmmio->dws);

	iounmap(dwsmmio->dws.regs);

	kfree(dwsmmio);

drivers/spi/spi-dw-pci.c

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int spi_pci_probe(struct pci_dev *pdev, 
	int pci_bar = 0;

	int ret;



	printk(KERN_INFO "DW: found PCI SPI controller(ID: %04x:%04x)\n",

	dev_info(&pdev->dev, "found PCI SPI controller(ID: %04x:%04x)\n",

		pdev->vendor, pdev->device);



	ret = pci_enable_device(pdev);
@@ -109,7 +109,6 @@ static void spi_pci_remove(struct pci_dev *pdev) 
{

	struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);



	pci_set_drvdata(pdev, NULL);

	dw_spi_remove_host(&dwpci->dws);

	iounmap(dwpci->dws.regs);

	pci_release_region(pdev, 0);