aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-clps711x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/spi-clps711x.c')
-rw-r--r--drivers/spi/spi-clps711x.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 17965fe225cc..5655acf55bfe 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
239 } 239 }
240 240
241 dev_err(&pdev->dev, "Failed to register master\n"); 241 dev_err(&pdev->dev, "Failed to register master\n");
242 devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
243 242
244clk_out: 243clk_out:
245 devm_clk_put(&pdev->dev, hw->spi_clk);
246
247err_out: 244err_out:
248 while (--i >= 0) 245 while (--i >= 0)
249 if (gpio_is_valid(hw->chipselect[i])) 246 if (gpio_is_valid(hw->chipselect[i]))
@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev)
261 struct spi_master *master = platform_get_drvdata(pdev); 258 struct spi_master *master = platform_get_drvdata(pdev);
262 struct spi_clps711x_data *hw = spi_master_get_devdata(master); 259 struct spi_clps711x_data *hw = spi_master_get_devdata(master);
263 260
264 devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
265
266 for (i = 0; i < master->num_chipselect; i++) 261 for (i = 0; i < master->num_chipselect; i++)
267 if (gpio_is_valid(hw->chipselect[i])) 262 if (gpio_is_valid(hw->chipselect[i]))
268 gpio_free(hw->chipselect[i]); 263 gpio_free(hw->chipselect[i]);
269 264
270 devm_clk_put(&pdev->dev, hw->spi_clk);
271 spi_unregister_master(master); 265 spi_unregister_master(master);
272 kfree(master); 266 kfree(master);
273 267