mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-04 04:02:26 +00:00
vt_buffer.h: get rid of dead code in default scr_...() instances
Only 4 architectures define VT_BUF_HAVE_RW (alpha, mips, powerpc, sparc) and all of them define VT_BUF_HAVE_MEM{SET,CPY,MOVE}W. In other words, the code under #ifdef VT_BUF_HAVE_RW in default scr_mem...w() instances won't be compiled anyway. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
c0dc92144b
commit
fb56007c9b
@ -28,45 +28,21 @@
|
|||||||
#ifndef VT_BUF_HAVE_MEMSETW
|
#ifndef VT_BUF_HAVE_MEMSETW
|
||||||
static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
|
static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
|
||||||
{
|
{
|
||||||
#ifdef VT_BUF_HAVE_RW
|
|
||||||
count /= 2;
|
|
||||||
while (count--)
|
|
||||||
scr_writew(c, s++);
|
|
||||||
#else
|
|
||||||
memset16(s, c, count / 2);
|
memset16(s, c, count / 2);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef VT_BUF_HAVE_MEMCPYW
|
#ifndef VT_BUF_HAVE_MEMCPYW
|
||||||
static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
|
static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
|
||||||
{
|
{
|
||||||
#ifdef VT_BUF_HAVE_RW
|
|
||||||
count /= 2;
|
|
||||||
while (count--)
|
|
||||||
scr_writew(scr_readw(s++), d++);
|
|
||||||
#else
|
|
||||||
memcpy(d, s, count);
|
memcpy(d, s, count);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef VT_BUF_HAVE_MEMMOVEW
|
#ifndef VT_BUF_HAVE_MEMMOVEW
|
||||||
static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
|
static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
|
||||||
{
|
{
|
||||||
#ifdef VT_BUF_HAVE_RW
|
|
||||||
if (d < s)
|
|
||||||
scr_memcpyw(d, s, count);
|
|
||||||
else {
|
|
||||||
count /= 2;
|
|
||||||
d += count;
|
|
||||||
s += count;
|
|
||||||
while (count--)
|
|
||||||
scr_writew(scr_readw(--s), --d);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
memmove(d, s, count);
|
memmove(d, s, count);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user