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

Commit bb3fc5dd authored by Tobias Klauser's avatar Tobias Klauser Committed by Ley Foon Tan
Browse files

nios2: Remove unnecessary #ifdef guards 



__HAVE_ARCH_MEMMOVE and __HAVE_ARCH_MEMSET are unconditionally defined
for nios2, so there is no need to protect the function definitions of
memmove() and memset().

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarLey Foon Tan <lftan@altera.com>
parent 713e9b80

arch/nios2/lib/memmove.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/string.h>

#include <linux/string.h>





#ifdef __HAVE_ARCH_MEMMOVE

void *memmove(void *d, const void *s, size_t count)

void *memmove(void *d, const void *s, size_t count)

{

{

	unsigned long dst, src;

	unsigned long dst, src;
@@ -79,4 +78,3 @@ void *memmove(void *d, const void *s, size_t count) 




	return d;

	return d;

}
 
}
 
#endif /* __HAVE_ARCH_MEMMOVE */

arch/nios2/lib/memset.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/string.h>

#include <linux/string.h>





#ifdef __HAVE_ARCH_MEMSET

void *memset(void *s, int c, size_t count)

void *memset(void *s, int c, size_t count)

{

{

	int destptr, charcnt, dwordcnt, fill8reg, wrkrega;

	int destptr, charcnt, dwordcnt, fill8reg, wrkrega;
@@ -78,4 +77,3 @@ void *memset(void *s, int c, size_t count) 




	return s;

	return s;

}
 
}
 
#endif /* __HAVE_ARCH_MEMSET */