Commit 776980cf authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: use BIT macro for POWER_MODE_CTRL single-bit fields 



Replace complex definition of POWER_MODE_CTRL register fields with BIT()
macro and use open-coded implementation for register manipulations.

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9412451

drivers/staging/sm750fb/ddk750_power.c

+4 −6
Original line number Diff line number Diff line
@@ -60,17 +60,15 @@ void setPowerMode(unsigned int powerMode) 


	/* Set up other fields in Power Control Register */

	if (powerMode == POWER_MODE_CTRL_MODE_SLEEP) {

		control_value =

		control_value &= ~POWER_MODE_CTRL_OSC_INPUT;

#ifdef VALIDATION_CHIP

		FIELD_SET(control_value, POWER_MODE_CTRL, 336CLK, OFF) |

		control_value &= ~POWER_MODE_CTRL_336CLK;

#endif

		FIELD_SET(control_value, POWER_MODE_CTRL, OSC_INPUT,  OFF);

	} else {

		control_value =

		control_value |= POWER_MODE_CTRL_OSC_INPUT;

#ifdef VALIDATION_CHIP

		FIELD_SET(control_value, POWER_MODE_CTRL, 336CLK, ON) |

		control_value |= POWER_MODE_CTRL_336CLK;

#endif

		FIELD_SET(control_value, POWER_MODE_CTRL, OSC_INPUT,  ON);

	}



	/* Program new power mode. */

drivers/staging/sm750fb/ddk750_reg.h

+3 −9
Original line number Diff line number Diff line
@@ -497,16 +497,10 @@ 


#define POWER_MODE_CTRL                               0x00004C

#ifdef VALIDATION_CHIP

    #define POWER_MODE_CTRL_336CLK                    4:4

    #define POWER_MODE_CTRL_336CLK_OFF                0

    #define POWER_MODE_CTRL_336CLK_ON                 1

    #define POWER_MODE_CTRL_336CLK                    BIT(4)

#endif

#define POWER_MODE_CTRL_OSC_INPUT                     3:3

#define POWER_MODE_CTRL_OSC_INPUT_OFF                 0

#define POWER_MODE_CTRL_OSC_INPUT_ON                  1

#define POWER_MODE_CTRL_ACPI                          2:2

#define POWER_MODE_CTRL_ACPI_OFF                      0

#define POWER_MODE_CTRL_ACPI_ON                       1

#define POWER_MODE_CTRL_OSC_INPUT                     BIT(3)

#define POWER_MODE_CTRL_ACPI                          BIT(2)

#define POWER_MODE_CTRL_MODE                          1:0

#define POWER_MODE_CTRL_MODE_MODE0                    0

#define POWER_MODE_CTRL_MODE_MODE1                    1