Commit d473de0f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: amiga: Clean up Amiga hardware configuration 



Move the generic Amiga hardware configuration section out of the
switch statement, which allows to replace all ugly jumps by break
statements.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200826125124.23863-1-geert@linux-m68k.org
parent 62148d98

arch/m68k/amiga/config.c

+58 −60
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void __init amiga_identify(void) 


	switch (amiga_model) {

	case AMI_UNKNOWN:

		goto Generic;

		break;



	case AMI_600:

	case AMI_1200:
@@ -227,7 +227,7 @@ static void __init amiga_identify(void) 
	case AMI_2000:

	case AMI_2500:

		AMIGAHW_SET(A2000_CLK);	/* Is this correct for all models? */

		goto Generic;

		break;



	case AMI_3000:

	case AMI_3000T:
@@ -238,7 +238,7 @@ static void __init amiga_identify(void) 
		AMIGAHW_SET(A3000_SCSI);

		AMIGAHW_SET(A3000_CLK);

		AMIGAHW_SET(ZORRO3);

		goto Generic;

		break;



	case AMI_4000T:

		AMIGAHW_SET(A4000_SCSI);
@@ -247,15 +247,21 @@ static void __init amiga_identify(void) 
		AMIGAHW_SET(A4000_IDE);

		AMIGAHW_SET(A3000_CLK);

		AMIGAHW_SET(ZORRO3);

		goto Generic;

		break;



	case AMI_CDTV:

	case AMI_CD32:

		AMIGAHW_SET(CD_ROM);

		AMIGAHW_SET(A2000_CLK);             /* Is this correct? */

		goto Generic;

		break;



	case AMI_DRACO:

		panic("No support for Draco yet");



	default:

		panic("Unknown Amiga Model");

	}



	Generic:

	AMIGAHW_SET(AMI_VIDEO);

	AMIGAHW_SET(AMI_BLITTER);

	AMIGAHW_SET(AMI_AUDIO);
@@ -309,14 +315,6 @@ static void __init amiga_identify(void) 
		break;

	}

	AMIGAHW_SET(ZORRO);

		break;



	case AMI_DRACO:

		panic("No support for Draco yet");



	default:

		panic("Unknown Amiga Model");

	}



#define AMIGAHW_ANNOUNCE(name, str)		\

	if (AMIGAHW_PRESENT(name))		\

CRA Git | Maintained and supported by SUSTech CRA and CCSE