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

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



Replace complex definition of DE_STATE1 fields and usage of FIELD_GET
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 c808d6ce

drivers/staging/sm750fb/ddk750_reg.h

+3 −9
Original line number Diff line number Diff line
@@ -6,15 +6,9 @@ 
#define DE_STATE1_DE_ABORT                               BIT(0)



#define DE_STATE2                                        0x100058

#define DE_STATE2_DE_FIFO                                3:3

#define DE_STATE2_DE_FIFO_NOTEMPTY                       0

#define DE_STATE2_DE_FIFO_EMPTY                          1

#define DE_STATE2_DE_STATUS                              2:2

#define DE_STATE2_DE_STATUS_IDLE                         0

#define DE_STATE2_DE_STATUS_BUSY                         1

#define DE_STATE2_DE_MEM_FIFO                            1:1

#define DE_STATE2_DE_MEM_FIFO_NOTEMPTY                   0

#define DE_STATE2_DE_MEM_FIFO_EMPTY                      1

#define DE_STATE2_DE_FIFO_EMPTY                          BIT(3)

#define DE_STATE2_DE_STATUS_BUSY                         BIT(2)

#define DE_STATE2_DE_MEM_FIFO_EMPTY                      BIT(1)

#define DE_STATE2_DE_RESERVED                            0:0

drivers/staging/sm750fb/sm750_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -493,16 +493,16 @@ void hw_sm750_initAccel(struct sm750_dev *sm750_dev) 
int hw_sm750le_deWait(void)

{

	int i = 0x10000000;

	unsigned int mask = DE_STATE2_DE_STATUS_BUSY | DE_STATE2_DE_FIFO_EMPTY |

		DE_STATE2_DE_MEM_FIFO_EMPTY;



	while (i--) {

		unsigned int val = PEEK32(DE_STATE2);



		if ((FIELD_GET(val, DE_STATE2, DE_STATUS) == DE_STATE2_DE_STATUS_IDLE) &&

		    (FIELD_GET(val, DE_STATE2, DE_FIFO) == DE_STATE2_DE_FIFO_EMPTY) &&

		    (FIELD_GET(val, DE_STATE2, DE_MEM_FIFO) == DE_STATE2_DE_MEM_FIFO_EMPTY)) {

		if ((val & mask) ==

		    (DE_STATE2_DE_FIFO_EMPTY | DE_STATE2_DE_MEM_FIFO_EMPTY))

			return 0;

	}

	}

	/* timeout error */

	return -1;

}