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

Commit 7d3a7001 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: idprom_32.c cleanup 



o Use C99 initializer for struct members
o fix code style issues
o Add KERN_WARNING to all printk
o Update prints to match sparc64

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf944c37

arch/sparc/kernel/idprom_32.c

+26 −24
Original line number Diff line number Diff line
@@ -11,35 +11,36 @@ 


#include <asm/oplib.h>

#include <asm/idprom.h>

#include <asm/machines.h>  /* Fun with Sun released architectures. */



struct idprom *idprom;

static struct idprom idprom_buffer;



#include <asm/machines.h>  /* Fun with Sun released architectures. */



/* Here is the master table of Sun machines which use some implementation

 * of the Sparc CPU and have a meaningful IDPROM machtype value that we

 * know about.  See asm-sparc/machines.h for empirical constants.

 */

static struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES] = {

/* First, Sun4's */

{ "Sun 4/100 Series", (SM_SUN4 | SM_4_110) },

{ "Sun 4/200 Series", (SM_SUN4 | SM_4_260) },

{ "Sun 4/300 Series", (SM_SUN4 | SM_4_330) },

{ "Sun 4/400 Series", (SM_SUN4 | SM_4_470) },

{ .name = "Sun 4/100 Series",        .id_machtype = (SM_SUN4 | SM_4_110) },

{ .name = "Sun 4/200 Series",        .id_machtype = (SM_SUN4 | SM_4_260) },

{ .name = "Sun 4/300 Series",        .id_machtype = (SM_SUN4 | SM_4_330) },

{ .name = "Sun 4/400 Series",        .id_machtype = (SM_SUN4 | SM_4_470) },

/* Now, Sun4c's */

{ "Sun4c SparcStation 1", (SM_SUN4C | SM_4C_SS1) },

{ "Sun4c SparcStation IPC", (SM_SUN4C | SM_4C_IPC) },

{ "Sun4c SparcStation 1+", (SM_SUN4C | SM_4C_SS1PLUS) },

{ "Sun4c SparcStation SLC", (SM_SUN4C | SM_4C_SLC) },

{ "Sun4c SparcStation 2", (SM_SUN4C | SM_4C_SS2) },

{ "Sun4c SparcStation ELC", (SM_SUN4C | SM_4C_ELC) },

{ "Sun4c SparcStation IPX", (SM_SUN4C | SM_4C_IPX) },

{ .name = "Sun4c SparcStation 1",    .id_machtype = (SM_SUN4C | SM_4C_SS1) },

{ .name = "Sun4c SparcStation IPC",  .id_machtype = (SM_SUN4C | SM_4C_IPC) },

{ .name = "Sun4c SparcStation 1+",   .id_machtype = (SM_SUN4C | SM_4C_SS1PLUS) },

{ .name = "Sun4c SparcStation SLC",  .id_machtype = (SM_SUN4C | SM_4C_SLC) },

{ .name = "Sun4c SparcStation 2",    .id_machtype = (SM_SUN4C | SM_4C_SS2) },

{ .name = "Sun4c SparcStation ELC",  .id_machtype = (SM_SUN4C | SM_4C_ELC) },

{ .name = "Sun4c SparcStation IPX",  .id_machtype = (SM_SUN4C | SM_4C_IPX) },

/* Finally, early Sun4m's */

{ "Sun4m SparcSystem600", (SM_SUN4M | SM_4M_SS60) },

{ "Sun4m SparcStation10/20", (SM_SUN4M | SM_4M_SS50) },

{ "Sun4m SparcStation5", (SM_SUN4M | SM_4M_SS40) },

{ .name = "Sun4m SparcSystem600",    .id_machtype = (SM_SUN4M | SM_4M_SS60) },

{ .name = "Sun4m SparcStation10/20", .id_machtype = (SM_SUN4M | SM_4M_SS50) },

{ .name = "Sun4m SparcStation5",     .id_machtype = (SM_SUN4M | SM_4M_SS40) },

/* One entry for the OBP arch's which are sun4d, sun4e, and newer sun4m's */

{ "Sun4M OBP based system", (SM_SUN4M_OBP | 0x0) } };

{ .name = "Sun4M OBP based system",  .id_machtype = (SM_SUN4M_OBP | 0x0) } };



static void __init display_system_type(unsigned char machtype)

{
@@ -51,14 +52,15 @@ static void __init display_system_type(unsigned char machtype) 
			if (machtype != (SM_SUN4M_OBP | 0x00) ||

			    prom_getproperty(prom_root_node, "banner-name",

					     sysname, sizeof(sysname)) <= 0)

				printk("TYPE: %s\n", Sun_Machines[i].name);

				printk(KERN_WARNING "TYPE: %s\n",

				       Sun_Machines[i].name);

			else

				printk("TYPE: %s\n", sysname);

				printk(KERN_WARNING "TYPE: %s\n", sysname);

			return;

		}

	}



	prom_printf("IDPROM: Bogus id_machtype value, 0x%x\n", machtype);

	prom_printf("IDPROM: Warning, bogus id_machtype value, 0x%x\n", machtype);

	prom_halt();

}
@@ -81,19 +83,19 @@ void __init idprom_init(void) 
	idprom = &idprom_buffer;



	if (idprom->id_format != 0x01) {

		prom_printf("IDPROM: Unknown format type!\n");

		prom_printf("IDPROM: Warning, unknown format type!\n");

		prom_halt();

	}



	if (idprom->id_cksum != calc_idprom_cksum(idprom)) {

		prom_printf("IDPROM: Checksum failure (nvram=%x, calc=%x)!\n",

		prom_printf("IDPROM: Warning, checksum failure (nvram=%x, calc=%x)!\n",

			    idprom->id_cksum, calc_idprom_cksum(idprom));

		prom_halt();

	}



	display_system_type(idprom->id_machtype);



	printk("Ethernet address: %x:%x:%x:%x:%x:%x\n",

	printk(KERN_WARNING "Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",

		    idprom->id_ethaddr[0], idprom->id_ethaddr[1],

		    idprom->id_ethaddr[2], idprom->id_ethaddr[3],

		    idprom->id_ethaddr[4], idprom->id_ethaddr[5]);