spi: omap2-mcspi: Remove the macro MOD_REG_BIT (af4e944d) · Commits · 戴 / test

drivers/spi/spi-omap2-mcspi.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -140,13 +140,6 @@ struct omap2_mcspi_cs {
		u32 chconf0;
		};

		#define MOD_REG_BIT(val, mask, set) do { \
		if (set) \
		val \|= mask; \
		else \
		val &= ~mask; \
		} while (0)

		static inline void mcspi_write_reg(struct spi_master *master,
		int idx, u32 val)
		{
		@@ -205,7 +198,11 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
		else
		rw = OMAP2_MCSPI_CHCONF_DMAW;

		MOD_REG_BIT(l, rw, enable);
		if (enable)
		l \|= rw;
		else
		l &= ~rw;

		mcspi_write_chconf0(spi, l);
		}

		@@ -224,7 +221,11 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
		u32 l;

		l = mcspi_cached_chconf0(spi);
		MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
		if (cs_active)
		l \|= OMAP2_MCSPI_CHCONF_FORCE;
		else
		l &= ~OMAP2_MCSPI_CHCONF_FORCE;

		mcspi_write_chconf0(spi, l);
		}

		@@ -239,9 +240,8 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
		* to single-channel master mode
		*/
		l = mcspi_read_reg(master, OMAP2_MCSPI_MODULCTRL);
		MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_STEST, 0);
		MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
		MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
		l &= ~(OMAP2_MCSPI_MODULCTRL_STEST \| OMAP2_MCSPI_MODULCTRL_MS);
		l \|= OMAP2_MCSPI_MODULCTRL_SINGLE;
		mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);

		ctx->modulctrl = l;
		@@ -1285,9 +1285,9 @@ static int omap2_mcspi_resume(struct device *dev)
		* We need to toggle CS state for OMAP take this
		* change in account.
		*/
		MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 1);
		cs->chconf0 \|= OMAP2_MCSPI_CHCONF_FORCE;
		__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
		MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 0);
		cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
		__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
		}
		}

Admin message