Skip to content

Commit

Permalink
thermal/drivers/hisi: Remove pointless irq field
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Lezcano authored and Eduardo Valentin committed Oct 23, 2018
1 parent 2cffaef commit a18e83e
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/thermal/hisi_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ struct hisi_thermal_data {
struct clk *clk;
void __iomem *regs;
int nr_sensors;
int irq;
};

/*
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit a18e83e

Please sign in to comment.