Commit 1788bcd1 authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

ipw2200, fix ipw io functions 



- some of them are defined as follows:
  #define ipw_write32	expr1; expr2
  and are called from loops or ifs without a compound statement, so
  they are broken. Fix it by putting them into do {} while (0) for
  writes and ({ }) for reads.
- also unify and cleanup them while at it -- convert them from
  macros to inline functions, so that we get some basic typechecking

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Cc: James Ketrenos <jketreno@linux.intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 191a99b7

drivers/net/wireless/ipw2x00/ipw2200.c

+60 −46
Original line number Original line Diff line number Diff line
@@ -301,88 +301,102 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c) 
}

}





/* 8-bit direct write (low 4K) */

/* 8-bit direct write (low 4K) */

#define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs))

static inline void _ipw_write8(struct ipw_priv *ipw, unsigned long ofs,

		u8 val)

{

	writeb(val, ipw->hw_base + ofs);

}





/* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

/* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

#define ipw_write8(ipw, ofs, val) do { \

#define ipw_write8(ipw, ofs, val) do { \

 IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

	IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, \

			__LINE__, (u32)(ofs), (u32)(val)); \

	_ipw_write8(ipw, ofs, val); \

	_ipw_write8(ipw, ofs, val); \

} while (0)

} while (0)





/* 16-bit direct write (low 4K) */

/* 16-bit direct write (low 4K) */

#define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))

static inline void _ipw_write16(struct ipw_priv *ipw, unsigned long ofs,

		u16 val)

{

	writew(val, ipw->hw_base + ofs);

}





/* 16-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

/* 16-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

#define ipw_write16(ipw, ofs, val) \

#define ipw_write16(ipw, ofs, val) do { \

 IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

	IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, \

 _ipw_write16(ipw, ofs, val)

			__LINE__, (u32)(ofs), (u32)(val)); \

	_ipw_write16(ipw, ofs, val); \

} while (0)





/* 32-bit direct write (low 4K) */

/* 32-bit direct write (low 4K) */

#define _ipw_write32(ipw, ofs, val) writel((val), (ipw)->hw_base + (ofs))

static inline void _ipw_write32(struct ipw_priv *ipw, unsigned long ofs,

		u32 val)

{

	writel(val, ipw->hw_base + ofs);

}





/* 32-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

/* 32-bit direct write (for low 4K of SRAM/regs), with debug wrapper */

#define ipw_write32(ipw, ofs, val) \

#define ipw_write32(ipw, ofs, val) do { \

 IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

	IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, \

 _ipw_write32(ipw, ofs, val)

			__LINE__, (u32)(ofs), (u32)(val)); \

	_ipw_write32(ipw, ofs, val); \

} while (0)





/* 8-bit direct read (low 4K) */

/* 8-bit direct read (low 4K) */

#define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))

static inline u8 _ipw_read8(struct ipw_priv *ipw, unsigned long ofs)



/* 8-bit direct read (low 4K), with debug wrapper */

static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)

{

{

	IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32) (ofs));

	return readb(ipw->hw_base + ofs);

	return _ipw_read8(ipw, ofs);

}

}





/* alias to 8-bit direct read (low 4K of SRAM/regs), with debug wrapper */

/* alias to 8-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)

#define ipw_read8(ipw, ofs) ({ \

	IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", __FILE__, __LINE__, \

			(u32)(ofs)); \

	_ipw_read8(ipw, ofs); \

})





/* 16-bit direct read (low 4K) */

/* 16-bit direct read (low 4K) */

#define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))

static inline u16 _ipw_read16(struct ipw_priv *ipw, unsigned long ofs)



/* 16-bit direct read (low 4K), with debug wrapper */

static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)

{

{

	IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32) (ofs));

	return readw(ipw->hw_base + ofs);

	return _ipw_read16(ipw, ofs);

}

}





/* alias to 16-bit direct read (low 4K of SRAM/regs), with debug wrapper */

/* alias to 16-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)

#define ipw_read16(ipw, ofs) ({ \

	IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", __FILE__, __LINE__, \

			(u32)(ofs)); \

	_ipw_read16(ipw, ofs); \

})





/* 32-bit direct read (low 4K) */

/* 32-bit direct read (low 4K) */

#define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))

static inline u32 _ipw_read32(struct ipw_priv *ipw, unsigned long ofs)



/* 32-bit direct read (low 4K), with debug wrapper */

static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)

{

{

	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32) (ofs));

	return readl(ipw->hw_base + ofs);

	return _ipw_read32(ipw, ofs);

}

}





/* alias to 32-bit direct read (low 4K of SRAM/regs), with debug wrapper */

/* alias to 32-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)

#define ipw_read32(ipw, ofs) ({ \

	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", __FILE__, __LINE__, \

			(u32)(ofs)); \

	_ipw_read32(ipw, ofs); \

})





/* multi-byte read (above 4K), with debug wrapper */

static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);

static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);

static inline void __ipw_read_indirect(const char *f, int l,

				       struct ipw_priv *a, u32 b, u8 * c, int d)

{

	IPW_DEBUG_IO("%s %d: read_indirect(0x%08X) %d bytes\n", f, l, (u32) (b),

		     d);

	_ipw_read_indirect(a, b, c, d);

}



/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */

/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */

#define ipw_read_indirect(a, b, c, d) __ipw_read_indirect(__FILE__, __LINE__, a, b, c, d)

#define ipw_read_indirect(a, b, c, d) ({ \

	IPW_DEBUG_IO("%s %d: read_indirect(0x%08X) %u bytes\n", __FILE__, \

			__LINE__, (u32)(b), (u32)(d)); \

	_ipw_read_indirect(a, b, c, d); \

})





/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */

/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */

static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * data,

static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * data,

				int num);

				int num);

#define ipw_write_indirect(a, b, c, d) \

#define ipw_write_indirect(a, b, c, d) do { \

	IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \

	IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %u bytes\n", __FILE__, \

	_ipw_write_indirect(a, b, c, d)

			__LINE__, (u32)(b), (u32)(d)); \

	_ipw_write_indirect(a, b, c, d); \

} while (0)





/* 32-bit indirect write (above 4K) */

/* 32-bit indirect write (above 4K) */

static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value)

static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value)