From: "Andrew Jeffery" <andrew@aj.id.au>
To: "Eddie James" <eajames@linux.ibm.com>, openbmc@lists.ozlabs.org
Subject: Re: [PATCH dev-5.0 2/2] hwmon (occ): Prevent sysfs error attribute from returning error
Date: Mon, 15 Apr 2019 21:19:54 -0400 [thread overview]
Message-ID: <04deb130-7ee8-4cb0-9fb3-b37c9b62350c@www.fastmail.com> (raw)
In-Reply-To: <1555367261-4299-2-git-send-email-eajames@linux.ibm.com>
On Tue, 16 Apr 2019, at 07:58, Eddie James wrote:
> The error sysfs attribute returns the stored error state of the OCC and
> doesn't depend on the OCC poll response. Therefore, split the error
> attribute into it's own function to avoid failing out of the function if
> the poll response fails.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Should this be sent upstream?
> ---
> drivers/hwmon/occ/sysfs.c | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hwmon/occ/sysfs.c b/drivers/hwmon/occ/sysfs.c
> index 743b26ec..9bf1526 100644
> --- a/drivers/hwmon/occ/sysfs.c
> +++ b/drivers/hwmon/occ/sysfs.c
> @@ -71,9 +71,6 @@ static ssize_t occ_sysfs_show(struct device *dev,
> else
> val = 1;
> break;
> - case 8:
> - val = occ->error;
> - break;
> default:
> return -EINVAL;
> }
> @@ -81,6 +78,16 @@ static ssize_t occ_sysfs_show(struct device *dev,
> return snprintf(buf, PAGE_SIZE - 1, "%d\n", val);
> }
>
> +static ssize_t occ_sysfs_error(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct occ *occ = dev_get_drvdata(dev);
> +
> + occ_update_response(occ);
> +
> + return snprintf(buf, PAGE_SIZE - 1, "%d\n", occ->error);
> +}
> +
> static SENSOR_DEVICE_ATTR(occ_master, 0444, occ_sysfs_show, NULL, 0);
> static SENSOR_DEVICE_ATTR(occ_active, 0444, occ_sysfs_show, NULL, 1);
> static SENSOR_DEVICE_ATTR(occ_dvfs_overtemp, 0444, occ_sysfs_show,
> NULL, 2);
> @@ -89,7 +96,7 @@ static SENSOR_DEVICE_ATTR(occ_mem_throttle, 0444,
> occ_sysfs_show, NULL, 4);
> static SENSOR_DEVICE_ATTR(occ_quick_pwr_drop, 0444, occ_sysfs_show,
> NULL, 5);
> static SENSOR_DEVICE_ATTR(occ_state, 0444, occ_sysfs_show, NULL, 6);
> static SENSOR_DEVICE_ATTR(occs_present, 0444, occ_sysfs_show, NULL, 7);
> -static SENSOR_DEVICE_ATTR(occ_error, 0444, occ_sysfs_show, NULL, 8);
> +static DEVICE_ATTR(occ_error, 0444, occ_sysfs_error, NULL);
>
> static struct attribute *occ_attributes[] = {
> &sensor_dev_attr_occ_master.dev_attr.attr,
> @@ -100,7 +107,7 @@ static struct attribute *occ_attributes[] = {
> &sensor_dev_attr_occ_quick_pwr_drop.dev_attr.attr,
> &sensor_dev_attr_occ_state.dev_attr.attr,
> &sensor_dev_attr_occs_present.dev_attr.attr,
> - &sensor_dev_attr_occ_error.dev_attr.attr,
> + &dev_attr_occ_error.attr,
> NULL
> };
>
> @@ -164,7 +171,7 @@ void occ_sysfs_poll_done(struct occ *occ)
> }
>
> if (occ->error && occ->error != occ->prev_error) {
> - name = sensor_dev_attr_occ_error.dev_attr.attr.name;
> + name = dev_attr_occ_error.attr.name;
> sysfs_notify(&occ->bus_dev->kobj, NULL, name);
> }
>
> --
> 2.7.4
>
>
next prev parent reply other threads:[~2019-04-16 1:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 22:27 [PATCH dev-5.0 1/2] hwmon (occ): Store error condition for rate-limited polls Eddie James
2019-04-15 22:27 ` [PATCH dev-5.0 2/2] hwmon (occ): Prevent sysfs error attribute from returning error Eddie James
2019-04-16 1:19 ` Andrew Jeffery [this message]
2019-04-16 1:20 ` [PATCH dev-5.0 1/2] hwmon (occ): Store error condition for rate-limited polls Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04deb130-7ee8-4cb0-9fb3-b37c9b62350c@www.fastmail.com \
--to=andrew@aj.id.au \
--cc=eajames@linux.ibm.com \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.