Commit 1f54f942 authored by Mark Brown's avatar Mark Brown

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

parents db04e170 c8b94d84
...@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev) ...@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
} }
dev_err(&pdev->dev, "Failed to register master\n"); dev_err(&pdev->dev, "Failed to register master\n");
devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
clk_out: clk_out:
devm_clk_put(&pdev->dev, hw->spi_clk);
err_out: err_out:
while (--i >= 0) while (--i >= 0)
if (gpio_is_valid(hw->chipselect[i])) if (gpio_is_valid(hw->chipselect[i]))
...@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev) ...@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev)
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct spi_clps711x_data *hw = spi_master_get_devdata(master); struct spi_clps711x_data *hw = spi_master_get_devdata(master);
devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
for (i = 0; i < master->num_chipselect; i++) for (i = 0; i < master->num_chipselect; i++)
if (gpio_is_valid(hw->chipselect[i])) if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]); gpio_free(hw->chipselect[i]);
devm_clk_put(&pdev->dev, hw->spi_clk);
spi_unregister_master(master); spi_unregister_master(master);
kfree(master); kfree(master);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment