evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2013-10-25 09:51:26 +01:00
commit 4cd667bb68
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/spi/spi-dw-mmio.c
View file

@ -74,7 +74,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
dwsmmio->clk = clk_get(&pdev->dev, NULL); dwsmmio->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(dwsmmio->clk)) { if (IS_ERR(dwsmmio->clk)) {
ret = PTR_ERR(dwsmmio->clk); ret = PTR_ERR(dwsmmio->clk);
goto err_irq; goto err_unmap;
} }
clk_enable(dwsmmio->clk); clk_enable(dwsmmio->clk);
@ -94,8 +94,6 @@ err_clk:
clk_disable(dwsmmio->clk); clk_disable(dwsmmio->clk);
clk_put(dwsmmio->clk); clk_put(dwsmmio->clk);
dwsmmio->clk = NULL; dwsmmio->clk = NULL;
err_irq:
free_irq(dws->irq, dws);
err_unmap: err_unmap:
iounmap(dws->regs); iounmap(dws->regs);
err_release_reg: err_release_reg:
@ -115,7 +113,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
clk_put(dwsmmio->clk); clk_put(dwsmmio->clk);
dwsmmio->clk = NULL; dwsmmio->clk = NULL;
free_irq(dwsmmio->dws.irq, &dwsmmio->dws);
dw_spi_remove_host(&dwsmmio->dws); dw_spi_remove_host(&dwsmmio->dws);
iounmap(dwsmmio->dws.regs); iounmap(dwsmmio->dws.regs);
kfree(dwsmmio); kfree(dwsmmio);

3
drivers/spi/spi-dw-pci.c
View file

@ -40,7 +40,7 @@ static int spi_pci_probe(struct pci_dev *pdev,
int pci_bar = 0; int pci_bar = 0;
int ret; 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); pdev->vendor, pdev->device);
ret = pci_enable_device(pdev); 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); struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);
pci_set_drvdata(pdev, NULL);
dw_spi_remove_host(&dwpci->dws); dw_spi_remove_host(&dwpci->dws);
iounmap(dwpci->dws.regs); iounmap(dwpci->dws.regs);
pci_release_region(pdev, 0); pci_release_region(pdev, 0);