Commit adf85265 authored by Paolo Ciarrocchi's avatar Paolo Ciarrocchi Committed by Ingo Molnar
Browse files

x86: coding style fixes to arch/x86/kernel/cpu/cyrix.c 



Before:
   total: 46 errors, 10 warnings, 450 lines checked
After:
   total: 1 errors, 10 warnings, 449 lines checked

No code changed:

arch/x86/kernel/cpu/cyrix.o:

   text	   data	    bss	    dec	    hex	filename
   2048	    908	      4	   2960	    b90	cyrix.o.before
   2048	    908	      4	   2960	    b90	cyrix.o.after

md5:
   9add5e69dbd788f91ff24eea8462dad7  cyrix.o.before.asm
   9add5e69dbd788f91ff24eea8462dad7  cyrix.o.after.asm

Signed-off-by: default avatarPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7030760a

arch/x86/kernel/cpu/cyrix.c

+56 −57
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1) 
			setCx86(CX86_CCR2, ccr2);

			*dir0 = 0xfe;

		}

	}

	else {

	} else {

		setCx86(CX86_CCR3, ccr3);  /* restore CCR3 */



		/* read DIR0 and DIR1 CPU registers */
@@ -187,8 +186,10 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
	char *buf = c->x86_model_id;

	const char *p = NULL;



	/* Bit 31 in normal CPUID used for nonstandard 3DNow ID;

	   3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */

	/*

	 * Bit 31 in normal CPUID used for nonstandard 3DNow ID;

	 * 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway

	 */

	clear_bit(0*32+31, c->x86_capability);



	/* Cyrix used bit 24 in extended (AMD) CPUID for Cyrix MMX extensions */
@@ -250,16 +251,17 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
#ifdef CONFIG_PCI

	{

		u32 vendor, device;

		/* It isn't really a PCI quirk directly, but the cure is the

		   same. The MediaGX has deep magic SMM stuff that handles the

		   SB emulation. It throws away the fifo on disable_dma() which

		   is wrong and ruins the audio. 



		   Bug2: VSA1 has a wrap bug so that using maximum sized DMA 

		   causes bad things. According to NatSemi VSA2 has another

		   bug to do with 'hlt'. I've not seen any boards using VSA2

		   and X doesn't seem to support it either so who cares 8).

		   VSA1 we work around however.

		/*

		 * It isn't really a PCI quirk directly, but the cure is the

		 * same. The MediaGX has deep magic SMM stuff that handles the

		 * SB emulation. It throws away the fifo on disable_dma() which

		 * is wrong and ruins the audio.

		 *

		 *  Bug2: VSA1 has a wrap bug so that using maximum sized DMA

		 *  causes bad things. According to NatSemi VSA2 has another

		 *  bug to do with 'hlt'. I've not seen any boards using VSA2

		 *  and X doesn't seem to support it either so who cares 8).

		 *  VSA1 we work around however.

		 */



		printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n");
@@ -296,8 +298,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
				geode_configure();

			get_model_name(c);  /* get CPU marketing name */

			return;

		}

		else {  /* MediaGX */

		} else { /* MediaGX */

			Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4';

			p = Cx86_cb+2;

			c->x86_model = (dir1 & 0x20) ? 1 : 2;
@@ -305,14 +306,11 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
		break;



	case 5: /* 6x86MX/M II */

		if (dir1 > 7)

		{

		if (dir1 > 7) {

			dir0_msn++;  /* M II */

			/* Enable MMX extensions (App note 108) */

			setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);

		}

		else

		{

		} else {

			c->coma_bug = 1;      /* 6x86MX, it has the bug. */

		}

		tmp = (!(dir0_lsn & 7) || dir0_lsn & 1) ? 2 : 0;
@@ -343,7 +341,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
		break;

	}

	strcpy(buf, Cx86_model[dir0_msn & 7]);

	if (p) strcat(buf, p);

	if (p)

		strcat(buf, p);

	return;

}
@@ -352,7 +351,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
 */

static void __cpuinit init_nsc(struct cpuinfo_x86 *c)

{

	/* There may be GX1 processors in the wild that are branded

	/*

	 * There may be GX1 processors in the wild that are branded

	 * NSC and not Cyrix.

	 *

	 * This function only handles the GX processor, and kicks every
@@ -417,8 +417,7 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 * c) 


		/* Check it is an affected model */



   	        if (dir0 == 5 || dir0 == 3)

   	        {

		if (dir0 == 5 || dir0 == 3) {

			unsigned char ccr3;

			unsigned long flags;

			printk(KERN_INFO "Enabling CPUID on Cyrix processor.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE