summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2018-09-25 11:03:09 +0200
committerEduardo Valentin <edubezval@gmail.com>2018-10-23 02:50:08 +0200
commita18e83e77217b63e4138470aa49d8269a201f76d (patch)
treedd51890cbb5fb9ce6ec7b31cc7af21e8f68ea6a3
parentthermal/drivers/hisi: Use platform_get_irq_byname (diff)
downloadlinux-a18e83e77217b63e4138470aa49d8269a201f76d.tar.xz
linux-a18e83e77217b63e4138470aa49d8269a201f76d.zip
thermal/drivers/hisi: Remove pointless irq field
The irq field in the data structure is pointless as the scope of its usage is just to request the interrupt. It can be replaced by a local variable. Use the 'ret' variable to get the interrupt number. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r--drivers/thermal/hisi_thermal.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 941c2c42ca79..87d8a135ad38 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -83,7 +83,6 @@ struct hisi_thermal_data {
struct clk *clk;
void __iomem *regs;
int nr_sensors;
- int irq;
};
/*
@@ -579,16 +578,16 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
- data->irq = platform_get_irq_byname(pdev, sensor->irq_name);
- if (data->irq < 0)
- return data->irq;
+ ret = platform_get_irq_byname(pdev, sensor->irq_name);
+ if (ret < 0)
+ return ret;
- ret = devm_request_threaded_irq(dev, data->irq, NULL,
+ ret = devm_request_threaded_irq(dev, ret, NULL,
hisi_thermal_alarm_irq_thread,
IRQF_ONESHOT, sensor->irq_name,
sensor);
if (ret < 0) {
- dev_err(dev, "failed to request alarm irq: %d\n", ret);
+ dev_err(dev, "Failed to request alarm irq: %d\n", ret);
return ret;
}