Commit 08445552 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

bcma: use static keyword for inline function declaration in bcma.h 



Just scratching an itch here, but it makes more sense to use the
static keyword if you think about how the compiler treats inline
functions.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d08f10d

include/linux/bcma/bcma.h

+12 −11
Original line number Original line Diff line number Diff line
@@ -205,50 +205,51 @@ struct bcma_bus { 
	struct ssb_sprom sprom;

	struct ssb_sprom sprom;

};

};





extern inline u32 bcma_read8(struct bcma_device *core, u16 offset)

static inline u32 bcma_read8(struct bcma_device *core, u16 offset)

{

{

	return core->bus->ops->read8(core, offset);

	return core->bus->ops->read8(core, offset);

}

}

extern inline u32 bcma_read16(struct bcma_device *core, u16 offset)

static inline u32 bcma_read16(struct bcma_device *core, u16 offset)

{

{

	return core->bus->ops->read16(core, offset);

	return core->bus->ops->read16(core, offset);

}

}

extern inline u32 bcma_read32(struct bcma_device *core, u16 offset)

static inline u32 bcma_read32(struct bcma_device *core, u16 offset)

{

{

	return core->bus->ops->read32(core, offset);

	return core->bus->ops->read32(core, offset);

}

}

extern inline

static inline

void bcma_write8(struct bcma_device *core, u16 offset, u32 value)

void bcma_write8(struct bcma_device *core, u16 offset, u32 value)

{

{

	core->bus->ops->write8(core, offset, value);

	core->bus->ops->write8(core, offset, value);

}

}

extern inline

static inline

void bcma_write16(struct bcma_device *core, u16 offset, u32 value)

void bcma_write16(struct bcma_device *core, u16 offset, u32 value)

{

{

	core->bus->ops->write16(core, offset, value);

	core->bus->ops->write16(core, offset, value);

}

}

extern inline

static inline

void bcma_write32(struct bcma_device *core, u16 offset, u32 value)

void bcma_write32(struct bcma_device *core, u16 offset, u32 value)

{

{

	core->bus->ops->write32(core, offset, value);

	core->bus->ops->write32(core, offset, value);

}

}

#ifdef CONFIG_BCMA_BLOCKIO

#ifdef CONFIG_BCMA_BLOCKIO

extern inline void bcma_block_read(struct bcma_device *core, void *buffer,

static inline void bcma_block_read(struct bcma_device *core, void *buffer,

				   size_t count, u16 offset, u8 reg_width)

				   size_t count, u16 offset, u8 reg_width)

{

{

	core->bus->ops->block_read(core, buffer, count, offset, reg_width);

	core->bus->ops->block_read(core, buffer, count, offset, reg_width);

}

}

extern inline void bcma_block_write(struct bcma_device *core, const void *buffer,

static inline void bcma_block_write(struct bcma_device *core,

				    size_t count, u16 offset, u8 reg_width)

				    const void *buffer, size_t count,

				    u16 offset, u8 reg_width)

{

{

	core->bus->ops->block_write(core, buffer, count, offset, reg_width);

	core->bus->ops->block_write(core, buffer, count, offset, reg_width);

}

}

#endif

#endif

extern inline u32 bcma_aread32(struct bcma_device *core, u16 offset)

static inline u32 bcma_aread32(struct bcma_device *core, u16 offset)

{

{

	return core->bus->ops->aread32(core, offset);

	return core->bus->ops->aread32(core, offset);

}

}

extern inline

static inline

void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)

void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)

{

{

	core->bus->ops->awrite32(core, offset, value);

	core->bus->ops->awrite32(core, offset, value);