035-mcfv4e_bitops_cleanup.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283
  1. From 898b269952d096ce3f990c51b02457c27e16b83c Mon Sep 17 00:00:00 2001
  2. From: Kurt Mahan <[email protected]>
  3. Date: Sun, 9 Dec 2007 02:25:49 -0700
  4. Subject: [PATCH] Clean up formatting.
  5. LTIBName: mcfv4e-bitops-cleanup
  6. Signed-off-by: Kurt Mahan <[email protected]>
  7. ---
  8. include/asm-m68k/bitops.h | 21 ++++++++++++++-------
  9. 1 files changed, 14 insertions(+), 7 deletions(-)
  10. --- a/include/asm-m68k/bitops.h
  11. +++ b/include/asm-m68k/bitops.h
  12. @@ -478,7 +478,8 @@ static __inline__ int __constant_coldfir
  13. return retval;
  14. }
  15. #else
  16. -static __inline__ int __constant_coldfire_test_and_set_bit(int nr,volatile void * vaddr)
  17. +static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
  18. + volatile void *vaddr)
  19. {
  20. char retval;
  21. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  22. @@ -516,7 +517,8 @@ static __inline__ void __constant_coldfi
  23. : "+QUd" (*p) : "di" (nr & 7));
  24. }
  25. #else
  26. -static __inline__ void __constant_coldfire_set_bit(int nr, volatile void * vaddr)
  27. +static __inline__ void __constant_coldfire_set_bit(int nr,
  28. + volatile void *vaddr)
  29. {
  30. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  31. __asm__ __volatile__ ("bset %1,(%3)"
  32. @@ -524,7 +526,8 @@ static __inline__ void __constant_coldfi
  33. }
  34. #endif
  35. -static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
  36. +static __inline__ void __generic_coldfire_set_bit(int nr,
  37. + volatile void *vaddr)
  38. {
  39. __asm__ __volatile__ ("bset %1,%0"
  40. : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
  41. @@ -552,7 +555,8 @@ static __inline__ int __constant_coldfir
  42. return retval;
  43. }
  44. #else
  45. -static __inline__ int __constant_coldfire_test_and_clear_bit(int nr, volatile void *vaddr)
  46. +static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
  47. + volatile void *vaddr)
  48. {
  49. char retval;
  50. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  51. @@ -599,7 +603,8 @@ static __inline__ void __constant_coldfi
  52. : "+QUd" (*p) : "id" (nr & 7));
  53. }
  54. #else
  55. -static __inline__ void __constant_coldfire_clear_bit(int nr, volatile void * vaddr)
  56. +static __inline__ void __constant_coldfire_clear_bit(int nr,
  57. + volatile void *vaddr)
  58. {
  59. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  60. __asm__ __volatile__ ("bclr %1,(%3)"
  61. @@ -636,7 +641,8 @@ static __inline__ int __constant_coldfir
  62. return retval;
  63. }
  64. #else
  65. -static __inline__ int __constant_coldfire_test_and_change_bit(int nr, volatile void * vaddr)
  66. +static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
  67. + volatile void *vaddr)
  68. {
  69. char retval;
  70. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  71. @@ -678,7 +684,8 @@ static __inline__ void __constant_coldfi
  72. : "+QUd" (*p) : "id" (nr & 7));
  73. }
  74. #else
  75. -static __inline__ void __constant_coldfire_change_bit(int nr, volatile void * vaddr)
  76. +static __inline__ void __constant_coldfire_change_bit(int nr,
  77. + volatile void *vaddr)
  78. {
  79. volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
  80. __asm__ __volatile__ ("bchg %1,(%3)"