Commit 0a584583 authored by Remis Lima Baima's avatar Remis Lima Baima Committed by Michal Simek
Browse files

microblaze: convert all simple headers to use asm-generic 



All the simple microblaze header files were adapted to use their
asm-generic implementations. These files are more simple and were quite
straightforward to change.

fb.h, vga.h and parport.h previously did not exist, using
the generic version makes it possible to build more drivers
successfully in allyesonfig.

Signed-off-by: default avatarRemis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 14f87389

arch/microblaze/include/asm/atomic.h

+1 −100
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_ATOMIC_H

#define _ASM_MICROBLAZE_ATOMIC_H



#include <linux/types.h>

#include <linux/compiler.h> /* likely */

#include <asm/system.h> /* local_irq_XXX and friends */



#define ATOMIC_INIT(i)		{ (i) }

#define atomic_read(v)		((v)->counter)

#define atomic_set(v, i)	(((v)->counter) = (i))



#define atomic_inc(v)		(atomic_add_return(1, (v)))

#define atomic_dec(v)		(atomic_sub_return(1, (v)))



#define atomic_add(i, v)	(atomic_add_return(i, (v)))

#define atomic_sub(i, v)	(atomic_sub_return(i, (v)))



#define atomic_inc_return(v)	(atomic_add_return(1, (v)))

#define atomic_dec_return(v)	(atomic_sub_return(1, (v)))



#define atomic_inc_and_test(v)	(atomic_add_return(1, (v)) == 0)

#define atomic_dec_and_test(v)	(atomic_sub_return(1, (v)) == 0)



#define atomic_inc_not_zero(v)	(atomic_add_unless((v), 1, 0))



#define atomic_sub_and_test(i, v) (atomic_sub_return((i), (v)) == 0)



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	int ret;

	unsigned long flags;



	local_irq_save(flags);

	ret = v->counter;

	if (likely(ret == old))

		v->counter = new;

	local_irq_restore(flags);



	return ret;

}



static inline int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;



	c = atomic_read(v);

	while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c)

		c = old;

	return c != u;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

{

	unsigned long flags;



	local_irq_save(flags);

	*addr &= ~mask;

	local_irq_restore(flags);

}



/**

 * atomic_add_return - add and return

 * @i: integer value to add

 * @v: pointer of type atomic_t

 *

 * Atomically adds @i to @v and returns @i + @v

 */

static inline int atomic_add_return(int i, atomic_t *v)

{

	unsigned long flags;

	int val;



	local_irq_save(flags);

	val = v->counter;

	v->counter = val += i;

	local_irq_restore(flags);



	return val;

}



static inline int atomic_sub_return(int i, atomic_t *v)

{

	return atomic_add_return(-i, v);

}

#include <asm-generic/atomic.h>



/*

 * Atomically test *v and decrement if it is greater than 0.
@@ -109,15 +21,4 @@ static inline int atomic_dec_if_positive(atomic_t *v) 
	return res;

}



#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#include <asm-generic/atomic-long.h>



#endif /* _ASM_MICROBLAZE_ATOMIC_H */

arch/microblaze/include/asm/bitops.h

+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_BITOPS_H

#define _ASM_MICROBLAZE_BITOPS_H



/*

 * Copyright 1992, Linus Torvalds.

 */



#include <asm/byteorder.h> /* swab32 */

#include <asm/system.h> /* save_flags */



/*

 * clear_bit() doesn't provide any barrier for the compiler.

 */

#define smp_mb__before_clear_bit()	barrier()

#define smp_mb__after_clear_bit()	barrier()

#include <asm-generic/bitops.h>
 
#include <asm-generic/bitops/__fls.h>



#endif /* _ASM_MICROBLAZE_BITOPS_H */

arch/microblaze/include/asm/bug.h

+0 −14
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_BUG_H

#define _ASM_MICROBLAZE_BUG_H



#include <linux/kernel.h>

#include <asm-generic/bug.h>
 


#endif /* _ASM_MICROBLAZE_BUG_H */

arch/microblaze/include/asm/bugs.h

+1 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_BUGS_H

#define _ASM_MICROBLAZE_BUGS_H



static inline void check_bugs(void)

{

	/* nothing to do */

}



#endif /* _ASM_MICROBLAZE_BUGS_H */
 
#include <asm-generic/bugs.h>

arch/microblaze/include/asm/fb.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include <asm-generic/fb.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE