From: Eduardo Valentin <eduardo.valentin@ti.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Eduardo Valentin <eduardo.valentin@ti.com>
Subject: [PATCH 01/50] staging: omap-thermal: use BIT() macro
Date: Fri, 15 Mar 2013 08:59:49 -0400 [thread overview]
Message-ID: <1363352438-15935-2-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1363352438-15935-1-git-send-email-eduardo.valentin@ti.com>
For code readability, this patch changes the bit definition
under omap-bandgap.h to use the BIT() macro.
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
drivers/staging/omap-thermal/omap-bandgap.h | 96 +++++++++++++-------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/drivers/staging/omap-thermal/omap-bandgap.h b/drivers/staging/omap-thermal/omap-bandgap.h
index 3e9072c..8d3ee2b 100644
--- a/drivers/staging/omap-thermal/omap-bandgap.h
+++ b/drivers/staging/omap-thermal/omap-bandgap.h
@@ -29,17 +29,17 @@
/* TEMP_SENSOR OMAP4430 */
#define OMAP4430_BGAP_TSHUT_SHIFT 11
-#define OMAP4430_BGAP_TSHUT_MASK (1 << 11)
+#define OMAP4430_BGAP_TSHUT_MASK BIT(11)
/* TEMP_SENSOR OMAP4430 */
#define OMAP4430_BGAP_TEMPSOFF_SHIFT 12
-#define OMAP4430_BGAP_TEMPSOFF_MASK (1 << 12)
+#define OMAP4430_BGAP_TEMPSOFF_MASK BIT(12)
#define OMAP4430_SINGLE_MODE_SHIFT 10
-#define OMAP4430_SINGLE_MODE_MASK (1 << 10)
+#define OMAP4430_SINGLE_MODE_MASK BIT(10)
#define OMAP4430_BGAP_TEMP_SENSOR_SOC_SHIFT 9
-#define OMAP4430_BGAP_TEMP_SENSOR_SOC_MASK (1 << 9)
+#define OMAP4430_BGAP_TEMP_SENSOR_SOC_MASK BIT(9)
#define OMAP4430_BGAP_TEMP_SENSOR_EOCZ_SHIFT 8
-#define OMAP4430_BGAP_TEMP_SENSOR_EOCZ_MASK (1 << 8)
+#define OMAP4430_BGAP_TEMP_SENSOR_EOCZ_MASK BIT(8)
#define OMAP4430_BGAP_TEMP_SENSOR_DTEMP_SHIFT 0
#define OMAP4430_BGAP_TEMP_SENSOR_DTEMP_MASK (0xff << 0)
@@ -53,21 +53,21 @@
/* TEMP_SENSOR OMAP4460 */
#define OMAP4460_BGAP_TEMPSOFF_SHIFT 13
-#define OMAP4460_BGAP_TEMPSOFF_MASK (1 << 13)
+#define OMAP4460_BGAP_TEMPSOFF_MASK BIT(13)
#define OMAP4460_BGAP_TEMP_SENSOR_SOC_SHIFT 11
-#define OMAP4460_BGAP_TEMP_SENSOR_SOC_MASK (1 << 11)
+#define OMAP4460_BGAP_TEMP_SENSOR_SOC_MASK BIT(11)
#define OMAP4460_BGAP_TEMP_SENSOR_EOCZ_SHIFT 10
-#define OMAP4460_BGAP_TEMP_SENSOR_EOCZ_MASK (1 << 10)
+#define OMAP4460_BGAP_TEMP_SENSOR_EOCZ_MASK BIT(10)
#define OMAP4460_BGAP_TEMP_SENSOR_DTEMP_SHIFT 0
#define OMAP4460_BGAP_TEMP_SENSOR_DTEMP_MASK (0x3ff << 0)
/* BANDGAP_CTRL */
#define OMAP4460_SINGLE_MODE_SHIFT 31
-#define OMAP4460_SINGLE_MODE_MASK (1 << 31)
+#define OMAP4460_SINGLE_MODE_MASK BIT(31)
#define OMAP4460_MASK_HOT_SHIFT 1
-#define OMAP4460_MASK_HOT_MASK (1 << 1)
+#define OMAP4460_MASK_HOT_MASK BIT(1)
#define OMAP4460_MASK_COLD_SHIFT 0
-#define OMAP4460_MASK_COLD_MASK (1 << 0)
+#define OMAP4460_MASK_COLD_MASK BIT(0)
/* BANDGAP_COUNTER */
#define OMAP4460_COUNTER_SHIFT 0
@@ -87,57 +87,57 @@
/* BANDGAP_STATUS */
#define OMAP4460_CLEAN_STOP_SHIFT 3
-#define OMAP4460_CLEAN_STOP_MASK (1 << 3)
+#define OMAP4460_CLEAN_STOP_MASK BIT(3)
#define OMAP4460_BGAP_ALERT_SHIFT 2
-#define OMAP4460_BGAP_ALERT_MASK (1 << 2)
+#define OMAP4460_BGAP_ALERT_MASK BIT(2)
#define OMAP4460_HOT_FLAG_SHIFT 1
-#define OMAP4460_HOT_FLAG_MASK (1 << 1)
+#define OMAP4460_HOT_FLAG_MASK BIT(1)
#define OMAP4460_COLD_FLAG_SHIFT 0
-#define OMAP4460_COLD_FLAG_MASK (1 << 0)
+#define OMAP4460_COLD_FLAG_MASK BIT(0)
/* TEMP_SENSOR OMAP5430 */
#define OMAP5430_BGAP_TEMP_SENSOR_SOC_SHIFT 12
-#define OMAP5430_BGAP_TEMP_SENSOR_SOC_MASK (1 << 12)
+#define OMAP5430_BGAP_TEMP_SENSOR_SOC_MASK BIT(12)
#define OMAP5430_BGAP_TEMPSOFF_SHIFT 11
-#define OMAP5430_BGAP_TEMPSOFF_MASK (1 << 11)
+#define OMAP5430_BGAP_TEMPSOFF_MASK BIT(11)
#define OMAP5430_BGAP_TEMP_SENSOR_EOCZ_SHIFT 10
-#define OMAP5430_BGAP_TEMP_SENSOR_EOCZ_MASK (1 << 10)
+#define OMAP5430_BGAP_TEMP_SENSOR_EOCZ_MASK BIT(10)
#define OMAP5430_BGAP_TEMP_SENSOR_DTEMP_SHIFT 0
#define OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK (0x3ff << 0)
/* BANDGAP_CTRL */
#define OMAP5430_MASK_HOT_CORE_SHIFT 5
-#define OMAP5430_MASK_HOT_CORE_MASK (1 << 5)
+#define OMAP5430_MASK_HOT_CORE_MASK BIT(5)
#define OMAP5430_MASK_COLD_CORE_SHIFT 4
-#define OMAP5430_MASK_COLD_CORE_MASK (1 << 4)
+#define OMAP5430_MASK_COLD_CORE_MASK BIT(4)
#define OMAP5430_MASK_HOT_GPU_SHIFT 3
-#define OMAP5430_MASK_HOT_GPU_MASK (1 << 3)
+#define OMAP5430_MASK_HOT_GPU_MASK BIT(3)
#define OMAP5430_MASK_COLD_GPU_SHIFT 2
-#define OMAP5430_MASK_COLD_GPU_MASK (1 << 2)
+#define OMAP5430_MASK_COLD_GPU_MASK BIT(2)
#define OMAP5430_MASK_HOT_MPU_SHIFT 1
-#define OMAP5430_MASK_HOT_MPU_MASK (1 << 1)
+#define OMAP5430_MASK_HOT_MPU_MASK BIT(1)
#define OMAP5430_MASK_COLD_MPU_SHIFT 0
-#define OMAP5430_MASK_COLD_MPU_MASK (1 << 0)
+#define OMAP5430_MASK_COLD_MPU_MASK BIT(0)
#define OMAP5430_MASK_SIDLEMODE_SHIFT 30
#define OMAP5430_MASK_SIDLEMODE_MASK (0x3 << 30)
#define OMAP5430_MASK_FREEZE_CORE_SHIFT 23
-#define OMAP5430_MASK_FREEZE_CORE_MASK (1 << 23)
+#define OMAP5430_MASK_FREEZE_CORE_MASK BIT(23)
#define OMAP5430_MASK_FREEZE_GPU_SHIFT 22
-#define OMAP5430_MASK_FREEZE_GPU_MASK (1 << 22)
+#define OMAP5430_MASK_FREEZE_GPU_MASK BIT(22)
#define OMAP5430_MASK_FREEZE_MPU_SHIFT 21
-#define OMAP5430_MASK_FREEZE_MPU_MASK (1 << 21)
+#define OMAP5430_MASK_FREEZE_MPU_MASK BIT(21)
#define OMAP5430_MASK_CLEAR_CORE_SHIFT 20
-#define OMAP5430_MASK_CLEAR_CORE_MASK (1 << 20)
+#define OMAP5430_MASK_CLEAR_CORE_MASK BIT(20)
#define OMAP5430_MASK_CLEAR_GPU_SHIFT 19
-#define OMAP5430_MASK_CLEAR_GPU_MASK (1 << 19)
+#define OMAP5430_MASK_CLEAR_GPU_MASK BIT(19)
#define OMAP5430_MASK_CLEAR_MPU_SHIFT 18
-#define OMAP5430_MASK_CLEAR_MPU_MASK (1 << 18)
+#define OMAP5430_MASK_CLEAR_MPU_MASK BIT(18)
#define OMAP5430_MASK_CLEAR_ACCUM_CORE_SHIFT 17
-#define OMAP5430_MASK_CLEAR_ACCUM_CORE_MASK (1 << 17)
+#define OMAP5430_MASK_CLEAR_ACCUM_CORE_MASK BIT(17)
#define OMAP5430_MASK_CLEAR_ACCUM_GPU_SHIFT 16
-#define OMAP5430_MASK_CLEAR_ACCUM_GPU_MASK (1 << 16)
+#define OMAP5430_MASK_CLEAR_ACCUM_GPU_MASK BIT(16)
#define OMAP5430_MASK_CLEAR_ACCUM_MPU_SHIFT 15
-#define OMAP5430_MASK_CLEAR_ACCUM_MPU_MASK (1 << 15)
+#define OMAP5430_MASK_CLEAR_ACCUM_MPU_MASK BIT(15)
/* BANDGAP_COUNTER */
#define OMAP5430_COUNTER_SHIFT 0
@@ -169,19 +169,19 @@
/* BANDGAP_STATUS */
#define OMAP5430_BGAP_ALERT_SHIFT 31
-#define OMAP5430_BGAP_ALERT_MASK (1 << 31)
+#define OMAP5430_BGAP_ALERT_MASK BIT(31)
#define OMAP5430_HOT_CORE_FLAG_SHIFT 5
-#define OMAP5430_HOT_CORE_FLAG_MASK (1 << 5)
+#define OMAP5430_HOT_CORE_FLAG_MASK BIT(5)
#define OMAP5430_COLD_CORE_FLAG_SHIFT 4
-#define OMAP5430_COLD_CORE_FLAG_MASK (1 << 4)
+#define OMAP5430_COLD_CORE_FLAG_MASK BIT(4)
#define OMAP5430_HOT_GPU_FLAG_SHIFT 3
-#define OMAP5430_HOT_GPU_FLAG_MASK (1 << 3)
+#define OMAP5430_HOT_GPU_FLAG_MASK BIT(3)
#define OMAP5430_COLD_GPU_FLAG_SHIFT 2
-#define OMAP5430_COLD_GPU_FLAG_MASK (1 << 2)
+#define OMAP5430_COLD_GPU_FLAG_MASK BIT(2)
#define OMAP5430_HOT_MPU_FLAG_SHIFT 1
-#define OMAP5430_HOT_MPU_FLAG_MASK (1 << 1)
+#define OMAP5430_HOT_MPU_FLAG_MASK BIT(1)
#define OMAP5430_COLD_MPU_FLAG_SHIFT 0
-#define OMAP5430_COLD_MPU_FLAG_MASK (1 << 0)
+#define OMAP5430_COLD_MPU_FLAG_MASK BIT(0)
/* Offsets from the base of temperature sensor registers */
@@ -434,14 +434,14 @@ struct omap_temp_sensor {
* @expose_sensor: callback to export sensor to thermal API
*/
struct omap_bandgap_data {
-#define OMAP_BANDGAP_FEATURE_TSHUT (1 << 0)
-#define OMAP_BANDGAP_FEATURE_TSHUT_CONFIG (1 << 1)
-#define OMAP_BANDGAP_FEATURE_TALERT (1 << 2)
-#define OMAP_BANDGAP_FEATURE_MODE_CONFIG (1 << 3)
-#define OMAP_BANDGAP_FEATURE_COUNTER (1 << 4)
-#define OMAP_BANDGAP_FEATURE_POWER_SWITCH (1 << 5)
-#define OMAP_BANDGAP_FEATURE_CLK_CTRL (1 << 6)
-#define OMAP_BANDGAP_FEATURE_FREEZE_BIT (1 << 7)
+#define OMAP_BANDGAP_FEATURE_TSHUT BIT(0)
+#define OMAP_BANDGAP_FEATURE_TSHUT_CONFIG BIT(1)
+#define OMAP_BANDGAP_FEATURE_TALERT BIT(2)
+#define OMAP_BANDGAP_FEATURE_MODE_CONFIG BIT(3)
+#define OMAP_BANDGAP_FEATURE_COUNTER BIT(4)
+#define OMAP_BANDGAP_FEATURE_POWER_SWITCH BIT(5)
+#define OMAP_BANDGAP_FEATURE_CLK_CTRL BIT(6)
+#define OMAP_BANDGAP_FEATURE_FREEZE_BIT BIT(7)
#define OMAP_BANDGAP_HAS(b, f) \
((b)->conf->features & OMAP_BANDGAP_FEATURE_ ## f)
unsigned int features;
--
1.7.7.1.488.ge8e1c
next prev parent reply other threads:[~2013-03-15 13:01 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 12:59 [PATCH 00/50] staging: omap-thermal: several code refactoring Eduardo Valentin
2013-03-15 12:59 ` Eduardo Valentin [this message]
2013-03-15 12:59 ` [PATCH 02/50] staging: omap-thermal: remove unused _SHIFT macros Eduardo Valentin
2013-03-15 12:59 ` [PATCH 03/50] staging: omap-thermal: create header for register, bitfields and definitions Eduardo Valentin
2013-03-15 12:59 ` [PATCH 04/50] staging: omap-thermal: update documentation of omap-bandgap.h Eduardo Valentin
2013-03-15 12:59 ` [PATCH 05/50] staging: omap-thermal: style cleanup on omap-bandgap.c Eduardo Valentin
2013-03-15 12:59 ` [PATCH 06/50] staging: omap-thermal: fix error checking Eduardo Valentin
2013-03-15 12:59 ` [PATCH 07/50] staging: omap-thermal: introduce RMW_BITS macro Eduardo Valentin
2013-03-15 21:09 ` Dan Carpenter
2013-03-16 12:36 ` Eduardo Valentin
2013-03-16 14:00 ` Dan Carpenter
2013-03-15 12:59 ` [PATCH 08/50] staging: omap-thermal: add documentation for register access functions Eduardo Valentin
2013-03-15 12:59 ` [PATCH 09/50] staging: omap-thermal: make a omap_bandgap_power with only one exit point Eduardo Valentin
2013-03-15 21:22 ` Dan Carpenter
2013-03-16 12:39 ` Eduardo Valentin
2013-03-16 13:56 ` Dan Carpenter
2013-03-15 12:59 ` [PATCH 10/50] staging: omap-thermal: add documentation for omap_bandgap_power Eduardo Valentin
2013-03-15 12:59 ` [PATCH 11/50] staging: omap-thermal: add documentation for omap_bandgap_read_temp Eduardo Valentin
2013-03-15 13:00 ` [PATCH 12/50] staging: omap-thermal: rename talert handler Eduardo Valentin
2013-03-15 13:00 ` [PATCH 13/50] staging: omap-thermal: update documentation for talert irq handler Eduardo Valentin
2013-03-15 13:00 ` [PATCH 14/50] staging: omap-thermal: update tshut IRQ handler documentation Eduardo Valentin
2013-03-15 13:00 ` [PATCH 15/50] staging: omap-thermal: remove duplicated code Eduardo Valentin
2013-03-15 13:00 ` [PATCH 16/50] staging: omap-thermal: read status only once inside alert IRQ Eduardo Valentin
2013-03-15 13:00 ` [PATCH 17/50] staging: omap-thermal: add a section of register manipulation Eduardo Valentin
2013-03-15 13:00 ` [PATCH 18/50] staging: omap-thermal: section of basic helpers Eduardo Valentin
2013-03-15 13:00 ` [PATCH 19/50] staging: omap-thermal: IRQ handler section Eduardo Valentin
2013-03-15 13:00 ` [PATCH 20/50] staging: omap-thermal: ADC section Eduardo Valentin
2013-03-15 13:00 ` [PATCH 21/50] staging: omap-thermal: name adc_to_temp_conversion in a better way Eduardo Valentin
2013-03-15 13:00 ` [PATCH 22/50] staging: omap-thermal: rewrite omap_bandgap_adc_to_mcelsius on kernel coding style Eduardo Valentin
2013-03-16 8:27 ` Dan Carpenter
2013-03-15 13:00 ` [PATCH 23/50] staging: omap-thermal: add documentation for omap_bandgap_adc_to_mcelsius Eduardo Valentin
2013-03-15 13:00 ` [PATCH 24/50] staging: omap-thermal: name temp_to_adc_conversion in a better way Eduardo Valentin
2013-03-15 13:00 ` [PATCH 25/50] staging: omap-thermal: rewrite omap_bandgap_mcelsius_to_adc on kernel coding style Eduardo Valentin
2013-03-16 8:33 ` Dan Carpenter
2013-03-15 13:00 ` [PATCH 26/50] staging: omap-thermal: move conv table limits out of sensor data Eduardo Valentin
2013-03-15 13:00 ` [PATCH 27/50] staging: omap-thermal: add documentation for omap_bandgap_mcelsius_to_adc Eduardo Valentin
2013-03-15 13:00 ` [PATCH 28/50] staging: omap-thermal: rename add_hyst to omap_bandgap_add_hyst Eduardo Valentin
2013-03-15 13:00 ` [PATCH 29/50] staging: omap-thermal: document omap_bandgap_add_hyst function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 30/50] staging: omap-thermal: threshold manipulation section Eduardo Valentin
2013-03-15 13:00 ` [PATCH 31/50] staging: omap-thermal: refactor temp_sensor_unmask_interrupts Eduardo Valentin
2013-03-15 13:00 ` [PATCH 32/50] staging: omap-thermal: update omap_bandgap_unmask_interrupts documentation Eduardo Valentin
2013-03-15 13:00 ` [PATCH 33/50] staging: omap-thermal: refactor APIs handling threshold values Eduardo Valentin
2013-03-16 8:39 ` Dan Carpenter
2013-03-16 12:49 ` Eduardo Valentin
2013-03-16 13:58 ` Dan Carpenter
2013-03-15 13:00 ` [PATCH 34/50] staging: omap-thermal: device initialization section Eduardo Valentin
2013-03-15 13:00 ` [PATCH 35/50] staging: omap-thermal: section of device driver callbacks Eduardo Valentin
2013-03-15 13:00 ` [PATCH 36/50] staging: omap-thermal: rename enable_continuous_mode Eduardo Valentin
2013-03-15 13:00 ` [PATCH 37/50] staging: omap-thermal: update omap_bandgap_set_continous_mode documentation Eduardo Valentin
2013-03-15 13:00 ` [PATCH 38/50] staging: omap-thermal: document omap_bandgap_force_single_read Eduardo Valentin
2013-03-15 13:00 ` [PATCH 39/50] staging: omap-thermal: document omap_bandgap_update_alert_threshold function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 40/50] staging: omap-thermal: document _omap_bandgap_write_threshold function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 41/50] staging: omap-thermal: document _omap_bandgap_read_threshold function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 42/50] staging: omap-thermal: document omap_bandgap_tshut_init function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 43/50] staging: omap-thermal: document omap_bandgap_alert_init function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 44/50] staging: omap-thermal: document omap_bandgap_build function Eduardo Valentin
2013-03-15 13:00 ` [PATCH 45/50] staging: omap-thermal: change Kconfig dependency method Eduardo Valentin
2013-03-15 13:00 ` [PATCH 46/50] staging: Add a MAINTAINERS entry for TI bandgap and thermal driver Eduardo Valentin
2013-03-15 13:00 ` [PATCH 47/50] staging: omap-thermal: switch mutex to spinlock inside omap-bandgap Eduardo Valentin
2013-03-16 8:59 ` Dan Carpenter
2013-03-16 12:41 ` Eduardo Valentin
2013-03-16 14:22 ` Dan Carpenter
2013-03-15 13:00 ` [PATCH 48/50] staging: omap-thermal: remove TODO entry suggesting regmap usage Eduardo Valentin
2013-03-15 13:00 ` [PATCH 49/50] staging: omap-thermal: remove TODO entry for exposed APIs Eduardo Valentin
2013-03-15 13:00 ` [PATCH 50/50] staging: omap-thermal: add documentation for omap_bandgap_validate Eduardo Valentin
2013-03-16 9:05 ` [PATCH 00/50] staging: omap-thermal: several code refactoring Dan Carpenter
2013-03-16 12:46 ` Eduardo Valentin
2013-03-16 16:16 ` Greg KH
2013-03-18 14:44 ` Eduardo Valentin
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=1363352438-15935-2-git-send-email-eduardo.valentin@ti.com \
--to=eduardo.valentin@ti.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).