The data for the (optional) fan tachometer input is moved to a separate
structure which is only allocated if an input is actually configured.
After this change the pulse IRQ handler takes a pointer to the
tachometer data structure instead of the whole device context.
Signed-off-by: Paul Barker <pbarker@xxxxxxxxxxxx>
---
drivers/hwmon/pwm-fan.c | 66 +++++++++++++++++++++++++----------------
1 file changed, 40 insertions(+), 26 deletions(-)
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index c4e0059ccaec..7c75ce78b36a 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -22,17 +22,21 @@
#define MAX_PWM 255
-struct pwm_fan_ctx {
- struct mutex lock;
- struct pwm_device *pwm;
- struct regulator *reg_en;
-
+struct pwm_fan_tach {
int irq;
atomic_t pulses;
unsigned int rpm;
u8 pulses_per_revolution;
+
struct sensor_device_attribute sensor_attr;
+};
+struct pwm_fan_ctx {
+ struct mutex lock;
+ struct pwm_device *pwm;
+ struct regulator *reg_en;
+
+ struct pwm_fan_tach *tach;
ktime_t sample_start;
struct timer_list rpm_timer;
@@ -49,9 +53,9 @@ struct pwm_fan_ctx {
/* This handler assumes self resetting edge triggered interrupt. */
static irqreturn_t pulse_handler(int irq, void *dev_id)
{
- struct pwm_fan_ctx *ctx = dev_id;
+ struct pwm_fan_tach *tach = dev_id;
- atomic_inc(&ctx->pulses);
+ atomic_inc(&tach->pulses);
return IRQ_HANDLED;
}
@@ -59,14 +63,15 @@ 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_tach *tach = ctx->tach;
unsigned int delta = ktime_ms_delta(ktime_get(), ctx->sample_start);
int pulses;
if (delta) {
- pulses = atomic_read(&ctx->pulses);
- atomic_sub(pulses, &ctx->pulses);
- ctx->rpm = (unsigned int)(pulses * 1000 * 60) /
- (ctx->pulses_per_revolution * delta);
+ pulses = atomic_read(&tach->pulses);
+ atomic_sub(pulses, &tach->pulses);
+ tach->rpm = (unsigned int)(pulses * 1000 * 60) /
+ (tach->pulses_per_revolution * delta);
ctx->sample_start = ktime_get();
}
@@ -138,8 +143,9 @@ static ssize_t rpm_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct pwm_fan_ctx *ctx = dev_get_drvdata(dev);
+ struct pwm_fan_tach *tach = ctx->tach;
- return sprintf(buf, "%u\n", ctx->rpm);
+ return sprintf(buf, "%u\n", tach->rpm);
}
static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);
@@ -324,14 +330,22 @@ static int pwm_fan_probe(struct platform_device *pdev)
ctx->fan_group.attrs[0] = &sensor_dev_attr_pwm1.dev_attr.attr;
if (tach_count > 0) {
+ struct pwm_fan_tach *tach;
u32 ppr = 2;
- ctx->irq = platform_get_irq(pdev, 0);
- if (ctx->irq == -EPROBE_DEFER)
- return ctx->irq;
- if (ctx->irq > 0) {
- ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0,
- pdev->name, ctx);
+ ctx->tach = devm_kzalloc(dev, sizeof(struct pwm_fan_tach),
+ GFP_KERNEL);
+ if (!ctx->tach)
+ return -ENOMEM;
+
+ tach = ctx->tach;
+
+ tach->irq = platform_get_irq(pdev, 0);
+ 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);
if (ret) {
dev_err(dev,
"Failed to request interrupt: %d\n",
@@ -343,21 +357,21 @@ static int pwm_fan_probe(struct platform_device *pdev)
of_property_read_u32(dev->of_node,
"pulses-per-revolution",
&ppr);
- ctx->pulses_per_revolution = ppr;
- if (!ctx->pulses_per_revolution) {
+ tach->pulses_per_revolution = ppr;
+ if (!tach->pulses_per_revolution) {
dev_err(dev, "pulses-per-revolution can't be zero.\n");
return -EINVAL;
}
- sysfs_attr_init(&ctx->sensor_attr.dev_attr.attr);
+ sysfs_attr_init(&tach->sensor_attr.dev_attr.attr);
- ctx->sensor_attr.dev_attr.attr.name = "fan1_input";
- ctx->sensor_attr.dev_attr.attr.mode = 0444;
- ctx->sensor_attr.dev_attr.show = rpm_show;
- ctx->fan_group.attrs[1] = &ctx->sensor_attr.dev_attr.attr;
+ tach->sensor_attr.dev_attr.attr.name = "fan1_input";
+ tach->sensor_attr.dev_attr.attr.mode = 0444;
+ tach->sensor_attr.dev_attr.show = rpm_show;
+ ctx->fan_group.attrs[1] = &tach->sensor_attr.dev_attr.attr;
dev_dbg(dev, "tach: irq=%d, pulses_per_revolution=%d\n",
- ctx->irq, ctx->pulses_per_revolution);
+ tach->irq, tach->pulses_per_revolution);
ctx->sample_start = ktime_get();
mod_timer(&ctx->rpm_timer, jiffies + HZ);
--
2.29.2
