spi: spi-imx: Do not store the irq number in the private structure
The irq number is only used inside the probe function, so there is really no need to store it in the private structure. Use a local 'irq' variable to hold the the irq number instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
97bf6af1f9
Коммит
4b5d6aadce
|
@ -89,7 +89,6 @@ struct spi_imx_data {
|
|||
|
||||
struct completion xfer_done;
|
||||
void __iomem *base;
|
||||
int irq;
|
||||
struct clk *clk_per;
|
||||
struct clk *clk_ipg;
|
||||
unsigned long spi_clk;
|
||||
|
@ -1076,7 +1075,7 @@ static int spi_imx_probe(struct platform_device *pdev)
|
|||
struct spi_master *master;
|
||||
struct spi_imx_data *spi_imx;
|
||||
struct resource *res;
|
||||
int i, ret, num_cs;
|
||||
int i, ret, num_cs, irq;
|
||||
|
||||
if (!np && !mxc_platform_info) {
|
||||
dev_err(&pdev->dev, "can't get the platform data\n");
|
||||
|
@ -1143,16 +1142,16 @@ static int spi_imx_probe(struct platform_device *pdev)
|
|||
goto out_master_put;
|
||||
}
|
||||
|
||||
spi_imx->irq = platform_get_irq(pdev, 0);
|
||||
if (spi_imx->irq < 0) {
|
||||
ret = spi_imx->irq;
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
ret = irq;
|
||||
goto out_master_put;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(&pdev->dev, spi_imx->irq, spi_imx_isr, 0,
|
||||
ret = devm_request_irq(&pdev->dev, irq, spi_imx_isr, 0,
|
||||
dev_name(&pdev->dev), spi_imx);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "can't get irq%d: %d\n", spi_imx->irq, ret);
|
||||
dev_err(&pdev->dev, "can't get irq%d: %d\n", irq, ret);
|
||||
goto out_master_put;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче