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

Commit e53ced1b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

arch/m68k/mac/macboing.c: use unsigned long for irqflags 



Fix the warnings

  arch/m68k/mac/macboing.c: In function 'mac_mksound':
  arch/m68k/mac/macboing.c:189: warning: comparison of distinct pointer types lacks a cast
  arch/m68k/mac/macboing.c:211: warning: comparison of distinct pointer types lacks a cast
  arch/m68k/mac/macboing.c: In function 'mac_quadra_start_bell':
  arch/m68k/mac/macboing.c:241: warning: comparison of distinct pointer types lacks a cast
  arch/m68k/mac/macboing.c:263: warning: comparison of distinct pointer types lacks a cast
  arch/m68k/mac/macboing.c: In function 'mac_quadra_ring_bell':
  arch/m68k/mac/macboing.c:283: warning: comparison of distinct pointer types lacks a cast

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63d66cab

arch/m68k/mac/macboing.c

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void mac_init_asc( void ) 
void mac_mksound( unsigned int freq, unsigned int length )

{

	__u32 cfreq = ( freq << 5 ) / 468;

	__u32 flags;

	unsigned long flags;

	int i;



	if ( mac_special_bell == NULL )
@@ -224,7 +224,7 @@ static void mac_nosound( unsigned long ignored ) 
 */

static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsigned int volume )

{

	__u32 flags;

	unsigned long flags;



	/* if the bell is already ringing, ring longer */

	if ( mac_bell_duration > 0 )
@@ -271,7 +271,7 @@ static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsig 
static void mac_quadra_ring_bell( unsigned long ignored )

{

	int	i, count = mac_asc_samplespersec / HZ;

	__u32 flags;

	unsigned long flags;



	/*

	 * we neither want a sound buffer overflow nor underflow, so we need to match