From: Geert Uytterhoeven <geert+renesas@glider.be> To: Tony Lindgren <tony@atomide.com>, Russell King <linux@armlinux.org.uk>, Rajendra Nayak <rnayak@codeaurora.org>, Paul Walmsley <paul@pwsan.com>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Nicolas Ferre <nicolas.ferre@microchip.com>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, Tero Kristo <kristo@kernel.org>, Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>, Benoit Parrot <bparrot@ti.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, Andrew Jeffery <andrew@aj.id.au>, Ulf Hansson <ulf.hansson@linaro.org>, Joel Stanley <joel@jms.id.au>, Ping-Ke Shih <pkshih@realtek.com>, Kalle Valo <kvalo@codeaurora.org>, "David S . Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Linus Walleij <linus.walleij@linaro.org>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Eduardo Valentin <edubezval@gmail.com>, Keerthy <j-keerthy@ti.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-iio@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-gpio@vger.kernel.org, linux-pm@vger.kernel.org, alsa-devel@alsa-project.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH/RFC 15/17] thermal/ti-soc-thermal: Use bitfield helpers Date: Mon, 22 Nov 2021 16:54:08 +0100 [thread overview] Message-ID: <37efc6013a24653e316215424b160d613f42dcd5.1637592133.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1637592133.git.geert+renesas@glider.be> Use the field_{get,prep}() helpers, instead of open-coding the same operations. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Compile-tested only. Marked RFC, as this depends on [PATCH 01/17], but follows a different path to upstream. --- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c index ea0603b59309f5f0..83a34d698414b177 100644 --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c @@ -9,6 +9,7 @@ * Eduardo Valentin <eduardo.valentin@ti.com> */ +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/cpu_pm.h> #include <linux/device.h> @@ -80,10 +81,10 @@ do { \ struct temp_sensor_registers *t; \ u32 r; \ \ - t = bgp->conf->sensors[(id)].registers; \ + t = bgp->conf->sensors[(id)].registers; \ r = ti_bandgap_readl(bgp, t->reg); \ r &= ~t->mask; \ - r |= (val) << __ffs(t->mask); \ + r |= field_prep(t->mask, val); \ ti_bandgap_writel(bgp, r, t->reg); \ } while (0) @@ -342,8 +343,7 @@ static void ti_bandgap_read_counter(struct ti_bandgap *bgp, int id, tsr = bgp->conf->sensors[id].registers; time = ti_bandgap_readl(bgp, tsr->bgap_counter); - time = (time & tsr->counter_mask) >> - __ffs(tsr->counter_mask); + time = field_get(tsr->counter_mask, time); time = time * 1000 / bgp->clk_rate; *interval = time; } @@ -363,8 +363,7 @@ static void ti_bandgap_read_counter_delay(struct ti_bandgap *bgp, int id, tsr = bgp->conf->sensors[id].registers; reg_val = ti_bandgap_readl(bgp, tsr->bgap_mask_ctrl); - reg_val = (reg_val & tsr->mask_counter_delay_mask) >> - __ffs(tsr->mask_counter_delay_mask); + reg_val = field_get(tsr->mask_counter_delay_mask, reg_val); switch (reg_val) { case 0: *interval = 0; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Tony Lindgren <tony@atomide.com>, Russell King <linux@armlinux.org.uk>, Rajendra Nayak <rnayak@codeaurora.org>, Paul Walmsley <paul@pwsan.com>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Nicolas Ferre <nicolas.ferre@microchip.com>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, Tero Kristo <kristo@kernel.org>, Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>, Benoit Parrot <bparrot@ti.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, Andrew Jeffery <andrew@aj.id.au>, Ulf Hansson <ulf.hansson@linaro.org>, Joel Stanley <joel@jms.id.au>, Ping-Ke Shih <pkshih@realtek.com>, Kalle Valo <kvalo@codeaurora.org>, "David S . Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Linus Walleij <linus.walleij@linaro.org>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Eduardo Valentin <edubezval@gmail.com>, Keerthy <j-keerthy@ti.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org, Geert Uytterhoeven <geert+renesas@glider.be>, linux-aspeed@lists.ozlabs.org, linux-pm@vger.kernel.org, linux-iio@vger.kernel.org, linux-wireless@vger.kernel.org, openbmc@lists.ozlabs.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Subject: [PATCH/RFC 15/17] thermal/ti-soc-thermal: Use bitfield helpers Date: Mon, 22 Nov 2021 16:54:08 +0100 [thread overview] Message-ID: <37efc6013a24653e316215424b160d613f42dcd5.1637592133.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1637592133.git.geert+renesas@glider.be> Use the field_{get,prep}() helpers, instead of open-coding the same operations. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Compile-tested only. Marked RFC, as this depends on [PATCH 01/17], but follows a different path to upstream. --- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c index ea0603b59309f5f0..83a34d698414b177 100644 --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c @@ -9,6 +9,7 @@ * Eduardo Valentin <eduardo.valentin@ti.com> */ +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/cpu_pm.h> #include <linux/device.h> @@ -80,10 +81,10 @@ do { \ struct temp_sensor_registers *t; \ u32 r; \ \ - t = bgp->conf->sensors[(id)].registers; \ + t = bgp->conf->sensors[(id)].registers; \ r = ti_bandgap_readl(bgp, t->reg); \ r &= ~t->mask; \ - r |= (val) << __ffs(t->mask); \ + r |= field_prep(t->mask, val); \ ti_bandgap_writel(bgp, r, t->reg); \ } while (0) @@ -342,8 +343,7 @@ static void ti_bandgap_read_counter(struct ti_bandgap *bgp, int id, tsr = bgp->conf->sensors[id].registers; time = ti_bandgap_readl(bgp, tsr->bgap_counter); - time = (time & tsr->counter_mask) >> - __ffs(tsr->counter_mask); + time = field_get(tsr->counter_mask, time); time = time * 1000 / bgp->clk_rate; *interval = time; } @@ -363,8 +363,7 @@ static void ti_bandgap_read_counter_delay(struct ti_bandgap *bgp, int id, tsr = bgp->conf->sensors[id].registers; reg_val = ti_bandgap_readl(bgp, tsr->bgap_mask_ctrl); - reg_val = (reg_val & tsr->mask_counter_delay_mask) >> - __ffs(tsr->mask_counter_delay_mask); + reg_val = field_get(tsr->mask_counter_delay_mask, reg_val); switch (reg_val) { case 0: *interval = 0; -- 2.25.1
next prev parent reply other threads:[~2021-11-22 15:57 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-22 15:53 [PATCH 00/17] Non-const bitfield helper conversions Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:53 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 16:32 ` Johannes Berg 2021-11-22 16:32 ` Johannes Berg 2021-11-23 1:17 ` Jakub Kicinski 2021-11-23 1:17 ` Jakub Kicinski 2021-11-23 8:36 ` Geert Uytterhoeven 2021-11-23 8:36 ` [PATCH 01/17] bitfield: Add non-constant field_{prep, get}() helpers Geert Uytterhoeven 2021-11-23 16:24 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Johannes Berg 2021-11-23 16:24 ` Johannes Berg 2021-11-23 23:49 ` Jakub Kicinski 2021-11-23 23:49 ` Jakub Kicinski 2021-11-24 8:03 ` Johannes Berg 2021-11-24 13:59 ` Jakub Kicinski 2021-11-24 14:07 ` Johannes Berg 2021-11-23 23:39 ` Jakub Kicinski 2021-11-23 23:39 ` Jakub Kicinski 2021-11-23 1:52 ` Alex Elder 2021-11-23 1:52 ` Alex Elder 2021-11-23 8:38 ` Geert Uytterhoeven 2021-11-23 8:38 ` [PATCH 01/17] bitfield: Add non-constant field_{prep, get}() helpers Geert Uytterhoeven 2021-11-23 8:30 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Geert Uytterhoeven 2021-11-23 8:30 ` [PATCH 01/17] bitfield: Add non-constant field_{prep, get}() helpers Geert Uytterhoeven 2021-11-23 16:21 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Johannes Berg 2021-11-23 16:21 ` Johannes Berg 2021-11-23 16:31 ` Geert Uytterhoeven 2021-11-23 16:31 ` [PATCH 01/17] bitfield: Add non-constant field_{prep, get}() helpers Geert Uytterhoeven 2021-11-24 8:24 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Kalle Valo 2021-11-22 15:53 ` [PATCH 02/17] clk: renesas: Use bitfield helpers Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:53 ` [PATCH/RFC 03/17] soc: " Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:53 ` [PATCH/RFC 04/17] ARM: OMAP2+: " Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:53 ` [PATCH/RFC 05/17] bus: omap_l3_noc: " Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:53 ` [PATCH/RFC 06/17] clk: ti: " Geert Uytterhoeven 2021-11-22 15:53 ` Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 07/17] iio: st_sensors: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-23 23:35 ` Linus Walleij 2021-11-23 23:35 ` Linus Walleij 2021-11-22 15:54 ` [PATCH/RFC 08/17] iio: humidity: hts221: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-24 15:21 ` Jonathan Cameron 2021-11-22 15:54 ` [PATCH/RFC 09/17] iio: imu: st_lsm6dsx: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 10/17] media: ti-vpe: cal: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 11/17] mmc: sdhci-of-aspeed: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 12/17] pinctrl: aspeed: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 13/17] pinctl: ti: iodelay: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 17:52 ` Alexandre Belloni 2021-11-22 17:52 ` Alexandre Belloni 2021-11-22 15:54 ` [PATCH/RFC 14/17] regulator: ti-abb: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 16:31 ` Mark Brown 2021-11-22 16:31 ` Mark Brown 2021-11-22 15:54 ` Geert Uytterhoeven [this message] 2021-11-22 15:54 ` [PATCH/RFC 15/17] thermal/ti-soc-thermal: " Geert Uytterhoeven 2021-11-22 15:54 ` [PATCH/RFC 16/17] ALSA: ice1724: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-23 11:24 ` Takashi Iwai 2021-11-23 11:24 ` Takashi Iwai 2021-11-22 15:54 ` [PATCH/RFC 17/17] rtw89: " Geert Uytterhoeven 2021-11-22 15:54 ` Geert Uytterhoeven 2021-11-22 18:38 ` Larry Finger 2021-11-22 18:38 ` Larry Finger 2021-11-22 17:50 ` [PATCH 00/17] Non-const bitfield helper conversions Alexandre Belloni 2021-11-22 17:50 ` Alexandre Belloni 2021-11-23 8:20 ` Geert Uytterhoeven 2021-11-23 8:20 ` Geert Uytterhoeven
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=37efc6013a24653e316215424b160d613f42dcd5.1637592133.git.geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=adrian.hunter@intel.com \ --cc=alexandre.belloni@bootlin.com \ --cc=alsa-devel@alsa-project.org \ --cc=amitk@kernel.org \ --cc=andrew@aj.id.au \ --cc=bparrot@ti.com \ --cc=broonie@kernel.org \ --cc=daniel.lezcano@linaro.org \ --cc=davem@davemloft.net \ --cc=edubezval@gmail.com \ --cc=j-keerthy@ti.com \ --cc=jic23@kernel.org \ --cc=joel@jms.id.au \ --cc=kristo@kernel.org \ --cc=kuba@kernel.org \ --cc=kvalo@codeaurora.org \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=lorenzo.bianconi83@gmail.com \ --cc=ludovic.desroches@microchip.com \ --cc=magnus.damm@gmail.com \ --cc=mchehab@kernel.org \ --cc=mturquette@baylibre.com \ --cc=netdev@vger.kernel.org \ --cc=nicolas.ferre@microchip.com \ --cc=openbmc@lists.ozlabs.org \ --cc=paul@pwsan.com \ --cc=perex@perex.cz \ --cc=pkshih@realtek.com \ --cc=rafael@kernel.org \ --cc=rnayak@codeaurora.org \ --cc=rui.zhang@intel.com \ --cc=sboyd@kernel.org \ --cc=tiwai@suse.com \ --cc=tony@atomide.com \ --cc=ulf.hansson@linaro.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: 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.