From: Akinobu Mita <akinobu.mita@gmail.com> To: linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-pm@vger.kernel.org, linux-wireless@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.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 v4 03/12] platform/x86: asus-wmi: switch to use <linux/units.h> helpers Date: Sun, 15 Dec 2019 14:16:06 +0900 [thread overview] Message-ID: <1576386975-7941-4-git-send-email-akinobu.mita@gmail.com> (raw) In-Reply-To: <1576386975-7941-1-git-send-email-akinobu.mita@gmail.com> The asus-wmi driver doesn't implement the thermal device functionality directly, so including <linux/thermal.h> just for DECI_KELVIN_TO_CELSIUS() is a bit odd. This switches the asus-wmi driver to use deci_kelvin_to_millicelsius() in <linux/units.h>. The format string is changed from %d to %ld due to function returned type. 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> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> --- * v4 - change include order drivers/platform/x86/asus-wmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 821b08e..b254f9f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -33,9 +33,9 @@ #include <linux/seq_file.h> #include <linux/platform_data/x86/asus-wmi.h> #include <linux/platform_device.h> -#include <linux/thermal.h> #include <linux/acpi.h> #include <linux/dmi.h> +#include <linux/units.h> #include <acpi/battery.h> #include <acpi/video.h> @@ -1512,9 +1512,8 @@ static ssize_t asus_hwmon_temp1(struct device *dev, if (err < 0) return err; - value = DECI_KELVIN_TO_CELSIUS((value & 0xFFFF)) * 1000; - - return sprintf(buf, "%d\n", value); + return sprintf(buf, "%ld\n", + deci_kelvin_to_millicelsius(value & 0xFFFF)); } /* Fan1 */ -- 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-wireless@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.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 v4 03/12] platform/x86: asus-wmi: switch to use <linux/units.h> helpers Date: Sun, 15 Dec 2019 14:16:06 +0900 [thread overview] Message-ID: <1576386975-7941-4-git-send-email-akinobu.mita@gmail.com> (raw) In-Reply-To: <1576386975-7941-1-git-send-email-akinobu.mita@gmail.com> The asus-wmi driver doesn't implement the thermal device functionality directly, so including <linux/thermal.h> just for DECI_KELVIN_TO_CELSIUS() is a bit odd. This switches the asus-wmi driver to use deci_kelvin_to_millicelsius() in <linux/units.h>. The format string is changed from %d to %ld due to function returned type. 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> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> --- * v4 - change include order drivers/platform/x86/asus-wmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 821b08e..b254f9f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -33,9 +33,9 @@ #include <linux/seq_file.h> #include <linux/platform_data/x86/asus-wmi.h> #include <linux/platform_device.h> -#include <linux/thermal.h> #include <linux/acpi.h> #include <linux/dmi.h> +#include <linux/units.h> #include <acpi/battery.h> #include <acpi/video.h> @@ -1512,9 +1512,8 @@ static ssize_t asus_hwmon_temp1(struct device *dev, if (err < 0) return err; - value = DECI_KELVIN_TO_CELSIUS((value & 0xFFFF)) * 1000; - - return sprintf(buf, "%d\n", value); + return sprintf(buf, "%ld\n", + deci_kelvin_to_millicelsius(value & 0xFFFF)); } /* Fan1 */ -- 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-12-15 5:17 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-15 5:16 [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 01/12] add helpers for kelvin to/from Celsius conversion Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 02/12] ACPI: thermal: switch to use <linux/units.h> helpers Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita [this message] 2019-12-15 5:16 ` [PATCH v4 03/12] platform/x86: asus-wmi: " Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 04/12] platform/x86: intel_menlow: " Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 05/12] thermal: int340x: " Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 06/12] thermal: intel_pch: " Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 07/12] nvme: hwmon: " Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 08/12] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 09/12] iwlegacy: use <linux/units.h> helpers Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 10/12] iwlwifi: " Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 11/12] thermal: armada: remove unused TO_MCELSIUS macro Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 5:16 ` [PATCH v4 12/12] iio: adc: qcom-vadc-common: use <linux/units.h> helpers Akinobu Mita 2019-12-15 5:16 ` Akinobu Mita 2019-12-15 12:29 ` Jonathan Cameron 2019-12-15 12:29 ` Jonathan Cameron 2019-12-23 13:07 ` [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita 2019-12-23 13:07 ` 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=1576386975-7941-4-git-send-email-akinobu.mita@gmail.com \ --to=akinobu.mita@gmail.com \ --cc=akpm@linux-foundation.org \ --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-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-wireless@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.