Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3b6e14 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

dmaengine: ste_dma40: Use the BIT macro to replace ugly '(1 << x)'s 



The aim is to make the code that little more readable.

Acked-by: default avatarVinod Koul <vnod.koul@intel.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1e74043a

drivers/dma/ste_dma40.c

+10 −10
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 
#define MAX_LCLA_ALLOC_ATTEMPTS 256



/* Bit markings for allocation map */

#define D40_ALLOC_FREE		(1 << 31)

#define D40_ALLOC_PHY		(1 << 30)

#define D40_ALLOC_FREE		BIT(31)

#define D40_ALLOC_PHY		BIT(30)

#define D40_ALLOC_LOG_FREE	0



/* Reserved event lines for memcpy only. */
@@ -1738,7 +1738,7 @@ static irqreturn_t d40_handle_interrupt(int irq, void *data) 
		}



		/* ACK interrupt */

		writel(1 << idx, base->virtbase + il[row].clr);

		writel(BIT(idx), base->virtbase + il[row].clr);



		spin_lock(&d40c->lock);
@@ -1828,8 +1828,8 @@ static bool d40_alloc_mask_set(struct d40_phy_res *phy, 
		if (phy->allocated_src == D40_ALLOC_FREE)

			phy->allocated_src = D40_ALLOC_LOG_FREE;



		if (!(phy->allocated_src & (1 << log_event_line))) {

			phy->allocated_src |= 1 << log_event_line;

		if (!(phy->allocated_src & BIT(log_event_line))) {

			phy->allocated_src |= BIT(log_event_line);

			goto found;

		} else

			goto not_found;
@@ -1840,8 +1840,8 @@ static bool d40_alloc_mask_set(struct d40_phy_res *phy, 
		if (phy->allocated_dst == D40_ALLOC_FREE)

			phy->allocated_dst = D40_ALLOC_LOG_FREE;



		if (!(phy->allocated_dst & (1 << log_event_line))) {

			phy->allocated_dst |= 1 << log_event_line;

		if (!(phy->allocated_dst & BIT(log_event_line))) {

			phy->allocated_dst |= BIT(log_event_line);

			goto found;

		} else

			goto not_found;
@@ -1871,11 +1871,11 @@ static bool d40_alloc_mask_free(struct d40_phy_res *phy, bool is_src, 


	/* Logical channel */

	if (is_src) {

		phy->allocated_src &= ~(1 << log_event_line);

		phy->allocated_src &= ~BIT(log_event_line);

		if (phy->allocated_src == D40_ALLOC_LOG_FREE)

			phy->allocated_src = D40_ALLOC_FREE;

	} else {

		phy->allocated_dst &= ~(1 << log_event_line);

		phy->allocated_dst &= ~BIT(log_event_line);

		if (phy->allocated_dst == D40_ALLOC_LOG_FREE)

			phy->allocated_dst = D40_ALLOC_FREE;

	}
@@ -2356,7 +2356,7 @@ static void __d40_set_prio_rt(struct d40_chan *d40c, int dev_type, bool src) 
	u32 rtreg;

	u32 event = D40_TYPE_TO_EVENT(dev_type);

	u32 group = D40_TYPE_TO_GROUP(dev_type);

	u32 bit = 1 << event;

	u32 bit = BIT(event);

	u32 prioreg;

	struct d40_gen_dmac *dmac = &d40c->base->gen_dmac;