openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2013-10-25 09:51:27 +01:00
parent a59ca9773c 6a009e8d88
commit 23e0ad77e1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi-efm32.c
View File

@ -280,10 +280,6 @@ static irqreturn_t efm32_spi_txirq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct efm32_spi_pdata efm32_spi_pdata_default = {
.location = 1,
};
static u32 efm32_spi_get_configured_location(struct efm32_spi_ddata *ddata) static u32 efm32_spi_get_configured_location(struct efm32_spi_ddata *ddata)
{ {
u32 reg = efm32_spi_read32(ddata, REG_ROUTE); u32 reg = efm32_spi_read32(ddata, REG_ROUTE);
@ -387,7 +383,7 @@ static int efm32_spi_probe(struct platform_device *pdev)
goto err; goto err;
} }
if (resource_size(res) < 60) { if (resource_size(res) < 0x60) {
ret = -EINVAL; ret = -EINVAL;
dev_err(&pdev->dev, "memory resource too small\n"); dev_err(&pdev->dev, "memory resource too small\n");
goto err; goto err;
@ -467,7 +463,6 @@ static int efm32_spi_probe(struct platform_device *pdev)
clk_disable_unprepare(ddata->clk); clk_disable_unprepare(ddata->clk);
err: err:
spi_master_put(master); spi_master_put(master);
kfree(master);
} }
return ret; return ret;
@ -486,7 +481,6 @@ static int efm32_spi_remove(struct platform_device *pdev)
free_irq(ddata->rxirq, ddata); free_irq(ddata->rxirq, ddata);
clk_disable_unprepare(ddata->clk); clk_disable_unprepare(ddata->clk);
spi_master_put(master); spi_master_put(master);
kfree(master);
return 0; return 0;
} }