mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-30 05:06:44 +07:00
[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: Alexey "## should be banned" Dobriyan <adobriyan@gmail.com> Acked-by: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2c5d81a581
commit
546cfdf47f
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user