diff options
| author | saturneric <[email protected]> | 2025-06-11 23:38:21 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-06-11 23:38:21 +0000 |
| commit | 0e99f621a88db810f7f95ccb917cf00924cb6e39 (patch) | |
| tree | 21f3653194dcc5e81bfb0205155a152f727f4cf3 /drivers/hwmon/pwm-fan.c | |
| parent | Merge tag 'v6.15' (diff) | |
| parent | Linux 6.16-rc1 (diff) | |
| download | kernel-0e99f621a88db810f7f95ccb917cf00924cb6e39.tar.gz kernel-0e99f621a88db810f7f95ccb917cf00924cb6e39.zip | |
Merge tag 'v6.16-rc1'
Linux 6.16-rc1
Diffstat (limited to 'drivers/hwmon/pwm-fan.c')
| -rw-r--r-- | drivers/hwmon/pwm-fan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 2d89a3d553e9..03214aa36868 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -86,7 +86,7 @@ static irqreturn_t pulse_handler(int irq, void *dev_id) static void sample_timer(struct timer_list *t) { - struct pwm_fan_ctx *ctx = from_timer(ctx, t, rpm_timer); + struct pwm_fan_ctx *ctx = timer_container_of(ctx, t, rpm_timer); unsigned int delta = ktime_ms_delta(ktime_get(), ctx->sample_start); int i; @@ -657,8 +657,8 @@ static int pwm_fan_probe(struct platform_device *pdev) if (tach->irq == -EPROBE_DEFER) return tach->irq; if (tach->irq > 0) { - ret = devm_request_irq(dev, tach->irq, pulse_handler, 0, - pdev->name, tach); + ret = devm_request_irq(dev, tach->irq, pulse_handler, + IRQF_NO_THREAD, pdev->name, tach); if (ret) { dev_err(dev, "Failed to request interrupt: %d\n", |