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

Commit 546cfdf4 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] ipmi: mem_{in,out}[bwl] => intf_mem_{in,out}[bwl] 



On mips:

drivers/char/ipmi/ipmi_si_intf.c:1274: error: conflicting types for 'mem_inb'
include/asm/io.h:436: error: previous definition of 'mem_inb' was here

Don't look at line 436 unless you really know what you're doing.

Move those static functions out of more or less generic namespace.

Signed-off-by: default avatarAlexey "## should be banned" Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2c5d81a5

drivers/char/ipmi/ipmi_si_intf.c

+12 −12
Original line number Diff line number Diff line
@@ -1270,36 +1270,36 @@ static int try_init_port(int intf_num, struct smi_info **new_info) 
	return 0;

}



static unsigned char mem_inb(struct si_sm_io *io, unsigned int offset)

static unsigned char intf_mem_inb(struct si_sm_io *io, unsigned int offset)

{

	return readb((io->addr)+(offset * io->regspacing));

}



static void mem_outb(struct si_sm_io *io, unsigned int offset,

static void intf_mem_outb(struct si_sm_io *io, unsigned int offset,

		     unsigned char b)

{

	writeb(b, (io->addr)+(offset * io->regspacing));

}



static unsigned char mem_inw(struct si_sm_io *io, unsigned int offset)

static unsigned char intf_mem_inw(struct si_sm_io *io, unsigned int offset)

{

	return (readw((io->addr)+(offset * io->regspacing)) >> io->regshift)

		&& 0xff;

}



static void mem_outw(struct si_sm_io *io, unsigned int offset,

static void intf_mem_outw(struct si_sm_io *io, unsigned int offset,

		     unsigned char b)

{

	writeb(b << io->regshift, (io->addr)+(offset * io->regspacing));

}



static unsigned char mem_inl(struct si_sm_io *io, unsigned int offset)

static unsigned char intf_mem_inl(struct si_sm_io *io, unsigned int offset)

{

	return (readl((io->addr)+(offset * io->regspacing)) >> io->regshift)

		&& 0xff;

}



static void mem_outl(struct si_sm_io *io, unsigned int offset,

static void intf_mem_outl(struct si_sm_io *io, unsigned int offset,

		     unsigned char b)

{

	writel(b << io->regshift, (io->addr)+(offset * io->regspacing));
@@ -1349,16 +1349,16 @@ static int mem_setup(struct smi_info *info) 
	   upon the register size. */

	switch (info->io.regsize) {

	case 1:

		info->io.inputb = mem_inb;

		info->io.outputb = mem_outb;

		info->io.inputb = intf_mem_inb;

		info->io.outputb = intf_mem_outb;

		break;

	case 2:

		info->io.inputb = mem_inw;

		info->io.outputb = mem_outw;

		info->io.inputb = intf_mem_inw;

		info->io.outputb = intf_mem_outw;

		break;

	case 4:

		info->io.inputb = mem_inl;

		info->io.outputb = mem_outl;

		info->io.inputb = intf_mem_inl;

		info->io.outputb = intf_mem_outl;

		break;

#ifdef readq

	case 8: