Skip to contentSkip to conversation

ASoC: mxs-saif: Do not store the irq number in the private structure

PATCH Applied Fabio Estevam 2 participants 2 messages Dec 30, 2014

Subsystems (3)
Sound Arm i.MX and Layerscape ASoC
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 ASoC: mxs-saif: Do not store the irq number in the private structure

From: Fabio Estevam <[email protected]>

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 <[email protected]>
---
 sound/soc/mxs/mxs-saif.c | 10 +++++-----
 sound/soc/mxs/mxs-saif.h |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)
sound/soc/mxs/mxs-saif.c +5 -5
index d986508..c866ade 100644
@@ -710,7 +710,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	struct resource *iores;
 	struct mxs_saif *saif;
-	int ret = 0;
+	int irq, ret = 0;
 	struct device_node *master;
 
 	if (!np)

@@ -763,16 +763,16 @@ static int mxs_saif_probe(struct platform_device *pdev)
 	if (IS_ERR(saif->base))
 		return PTR_ERR(saif->base);
 
-	saif->irq = platform_get_irq(pdev, 0);
-	if (saif->irq < 0) {
-		ret = saif->irq;
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		ret = irq;
 		dev_err(&pdev->dev, "failed to get irq resource: %d\n",
 			ret);
 		return ret;
 	}
 
 	saif->dev = &pdev->dev;
-	ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,
+	ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,
 			       dev_name(&pdev->dev), saif);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to request irq\n");
sound/soc/mxs/mxs-saif.h +0 -1
index fbaf7ba..9a4c0b2 100644
@@ -116,7 +116,6 @@ struct mxs_saif {
 	unsigned int mclk;
 	unsigned int mclk_in_use;
 	void __iomem *base;
-	int irq;
 	unsigned int id;
 	unsigned int master_id;
 	unsigned int cur_rate;
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw
Quoted 4 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

The irq number is only used inside the probe function, so there is really no need to store it in the private structure.

Applied, thanks.