From 351eaa309240835883e83f39568f115f6f8643a7 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 18 Apr 2012 22:16:50 +0000 Subject: [PATCH] --- yaml --- r: 305351 b: refs/heads/master c: ea5c64b06743b505e0eb4e6caa1810fe685c9559 h: refs/heads/master i: 305349: a1d67d59182901e606c67d2d7f02bb6ec1c5936d 305347: eb5c25e4ca73b9ac16ba523741c37b57bd7120be 305343: 9ae7c620880643258e6ca2e38d723e16c068f8fd v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/windfarm_core.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0074f5b0cf27..2689c1e60ea2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a94d72b13642364e4d9da6e9165da05c0e055507 +refs/heads/master: ea5c64b06743b505e0eb4e6caa1810fe685c9559 diff --git a/trunk/drivers/macintosh/windfarm_core.c b/trunk/drivers/macintosh/windfarm_core.c index ce8897933a84..ebafc2543d5f 100644 --- a/trunk/drivers/macintosh/windfarm_core.c +++ b/trunk/drivers/macintosh/windfarm_core.c @@ -164,13 +164,24 @@ static ssize_t wf_show_control(struct device *dev, struct device_attribute *attr, char *buf) { struct wf_control *ctrl = container_of(attr, struct wf_control, attr); + const char *typestr; s32 val = 0; int err; err = ctrl->ops->get_value(ctrl, &val); if (err < 0) return err; - return sprintf(buf, "%d\n", val); + switch(ctrl->type) { + case WF_CONTROL_RPM_FAN: + typestr = " RPM"; + break; + case WF_CONTROL_PWM_FAN: + typestr = " %"; + break; + default: + typestr = ""; + } + return sprintf(buf, "%d%s\n", val, typestr); } /* This is really only for debugging... */