From: Akinobu Mita <akinobu.mita@gmail.com> To: linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Akinobu Mita <akinobu.mita@gmail.com>, Sujith Thomas <sujith.thomas@intel.com>, Darren Hart <dvhart@infradead.org>, Andy Shevchenko <andy@infradead.org>, Zhang Rui <rui.zhang@intel.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amit.kucheria@verdurent.com>, Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net>, Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>, Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me> Subject: [PATCH v2 4/8] platform/x86: intel_menlow: switch to use <linux/temperature.h> helpers Date: Thu, 28 Nov 2019 23:54:35 +0900 [thread overview] Message-ID: <1574952879-7200-5-git-send-email-akinobu.mita@gmail.com> (raw) In-Reply-To: <1574952879-7200-1-git-send-email-akinobu.mita@gmail.com> This switches the intel_menlow driver to use deci_kelvin_to_celsius() and celsius_to_deci_kelvin() in <linux/temperature.h> instead of helpers in <linux/thermal.h>. This is preparation for centralizing the kelvin to/from Celsius conversion helpers in <linux/temperature.h>. This also removes a trailing space, while we're at it. Cc: Sujith Thomas <sujith.thomas@intel.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Andy Shevchenko <andy@infradead.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Amit Kucheria <amit.kucheria@verdurent.com> Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Keith Busch <kbusch@kernel.org> Cc: Jens Axboe <axboe@fb.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> --- * v2 - include <linux/temperature.h> explicitly from thermal drivers - fix s/temprature/temperature/ typo in commit log - don't mix up another fix (format string for cellsius value) drivers/platform/x86/intel_menlow.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index b102f6d..12c1094 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c @@ -20,6 +20,7 @@ #include <linux/pci.h> #include <linux/pm.h> #include <linux/slab.h> +#include <linux/temperature.h> #include <linux/thermal.h> #include <linux/types.h> @@ -302,8 +303,10 @@ static ssize_t aux_show(struct device *dev, struct device_attribute *dev_attr, int result; result = sensor_get_auxtrip(attr->handle, idx, &value); + if (result) + return result; - return result ? result : sprintf(buf, "%lu", DECI_KELVIN_TO_CELSIUS(value)); + return sprintf(buf, "%lu", deci_kelvin_to_celsius(value)); } static ssize_t aux0_show(struct device *dev, @@ -332,8 +335,8 @@ static ssize_t aux_store(struct device *dev, struct device_attribute *dev_attr, if (value < 0) return -EINVAL; - result = sensor_set_auxtrip(attr->handle, idx, - CELSIUS_TO_DECI_KELVIN(value)); + result = sensor_set_auxtrip(attr->handle, idx, + celsius_to_deci_kelvin(value)); return result ? result : count; } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Akinobu Mita <akinobu.mita@gmail.com> To: linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Amit Kucheria <amit.kucheria@verdurent.com>, Jean Delvare <jdelvare@suse.com>, Sagi Grimberg <sagi@grimberg.me>, Sujith Thomas <sujith.thomas@intel.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Akinobu Mita <akinobu.mita@gmail.com>, Jens Axboe <axboe@fb.com>, Guenter Roeck <linux@roeck-us.net>, Keith Busch <kbusch@kernel.org>, Darren Hart <dvhart@infradead.org>, Zhang Rui <rui.zhang@intel.com>, Christoph Hellwig <hch@lst.de>, Andy Shevchenko <andy@infradead.org> Subject: [PATCH v2 4/8] platform/x86: intel_menlow: switch to use <linux/temperature.h> helpers Date: Thu, 28 Nov 2019 23:54:35 +0900 [thread overview] Message-ID: <1574952879-7200-5-git-send-email-akinobu.mita@gmail.com> (raw) In-Reply-To: <1574952879-7200-1-git-send-email-akinobu.mita@gmail.com> This switches the intel_menlow driver to use deci_kelvin_to_celsius() and celsius_to_deci_kelvin() in <linux/temperature.h> instead of helpers in <linux/thermal.h>. This is preparation for centralizing the kelvin to/from Celsius conversion helpers in <linux/temperature.h>. This also removes a trailing space, while we're at it. Cc: Sujith Thomas <sujith.thomas@intel.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Andy Shevchenko <andy@infradead.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Amit Kucheria <amit.kucheria@verdurent.com> Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Keith Busch <kbusch@kernel.org> Cc: Jens Axboe <axboe@fb.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> --- * v2 - include <linux/temperature.h> explicitly from thermal drivers - fix s/temprature/temperature/ typo in commit log - don't mix up another fix (format string for cellsius value) drivers/platform/x86/intel_menlow.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index b102f6d..12c1094 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c @@ -20,6 +20,7 @@ #include <linux/pci.h> #include <linux/pm.h> #include <linux/slab.h> +#include <linux/temperature.h> #include <linux/thermal.h> #include <linux/types.h> @@ -302,8 +303,10 @@ static ssize_t aux_show(struct device *dev, struct device_attribute *dev_attr, int result; result = sensor_get_auxtrip(attr->handle, idx, &value); + if (result) + return result; - return result ? result : sprintf(buf, "%lu", DECI_KELVIN_TO_CELSIUS(value)); + return sprintf(buf, "%lu", deci_kelvin_to_celsius(value)); } static ssize_t aux0_show(struct device *dev, @@ -332,8 +335,8 @@ static ssize_t aux_store(struct device *dev, struct device_attribute *dev_attr, if (value < 0) return -EINVAL; - result = sensor_set_auxtrip(attr->handle, idx, - CELSIUS_TO_DECI_KELVIN(value)); + result = sensor_set_auxtrip(attr->handle, idx, + celsius_to_deci_kelvin(value)); return result ? result : count; } -- 2.7.4 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2019-11-28 14:55 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-28 14:54 [PATCH v2 0/8] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 14:54 ` [PATCH v2 1/8] " Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-12-06 16:49 ` Daniel Lezcano 2019-12-06 16:49 ` Daniel Lezcano 2019-12-07 15:57 ` Akinobu Mita 2019-12-07 15:57 ` Akinobu Mita 2019-11-28 14:54 ` [PATCH v2 2/8] ACPI: thermal: switch to use <linux/temperature.h> helpers Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 14:54 ` [PATCH v2 3/8] platform/x86: asus-wmi: " Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita [this message] 2019-11-28 14:54 ` [PATCH v2 4/8] platform/x86: intel_menlow: " Akinobu Mita 2019-11-28 15:02 ` Andy Shevchenko 2019-11-28 15:02 ` Andy Shevchenko 2019-11-28 14:54 ` [PATCH v2 5/8] thermal: int340x: " Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 14:54 ` [PATCH v2 6/8] thermal: intel_pch: " Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 14:54 ` [PATCH v2 7/8] nvme: hwmon: " Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita 2019-11-28 15:14 ` Guenter Roeck 2019-11-28 15:14 ` Guenter Roeck 2019-12-11 18:33 ` Keith Busch 2019-12-11 18:33 ` Keith Busch 2019-11-28 14:54 ` [PATCH v2 8/8] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> Akinobu Mita 2019-11-28 14:54 ` Akinobu Mita
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=1574952879-7200-5-git-send-email-akinobu.mita@gmail.com \ --to=akinobu.mita@gmail.com \ --cc=amit.kucheria@verdurent.com \ --cc=andy@infradead.org \ --cc=axboe@fb.com \ --cc=daniel.lezcano@linaro.org \ --cc=dvhart@infradead.org \ --cc=hch@lst.de \ --cc=jdelvare@suse.com \ --cc=kbusch@kernel.org \ --cc=linux-hwmon@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=rui.zhang@intel.com \ --cc=sagi@grimberg.me \ --cc=sujith.thomas@intel.com \ /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: linkBe 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.