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

staging: sm750fb: use BIT macro for DE_STATE1 single-bit field 



Replace complex definition of DE_STATE1 field and usage of FIELD_SET with
BIT() macro and open-coded register value modifications

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

drivers/staging/sm750fb/ddk750_reg.h

+1 −3
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ 


/* New register for SM750LE */

#define DE_STATE1                                        0x100054

#define DE_STATE1_DE_ABORT                               0:0

#define DE_STATE1_DE_ABORT_OFF                           0

#define DE_STATE1_DE_ABORT_ON                            1

#define DE_STATE1_DE_ABORT                               BIT(0)



#define DE_STATE2                                        0x100058

#define DE_STATE2_DE_FIFO                                3:3

drivers/staging/sm750fb/sm750_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -468,11 +468,11 @@ void hw_sm750_initAccel(struct sm750_dev *sm750_dev) 


	if (getChipType() == SM750LE) {

		reg = PEEK32(DE_STATE1);

		reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, ON);

		reg |= DE_STATE1_DE_ABORT;

		POKE32(DE_STATE1, reg);



		reg = PEEK32(DE_STATE1);

		reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, OFF);

		reg &= ~DE_STATE1_DE_ABORT;

		POKE32(DE_STATE1, reg);



	} else {