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

Commit 052dfb45 authored by Douglas Thompson's avatar Douglas Thompson Committed by Linus Torvalds
Browse files

drivers/edac: cleanup spaces-gotos after Lindent messup 



This patch fixes some remnant spaces inserted by the use of Lindent.
Seems Lindent adds some spaces when it shoulded. These have been fixed.
In addition, goto targets have issues, these have been fixed
in this patch.

Signed-off-by: default avatarDouglas Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6bc78404

drivers/edac/e752x_edac.c

+91 −90
Original line number Diff line number Diff line
@@ -865,10 +865,10 @@ static void e752x_init_mem_map_table(struct pci_dev *pdev, 
			 */

			pci_read_config_byte(pdev, E752X_DRB + index + 1,

					&value);

			pvt->map[index + 1] = (value == last) ? 0xff :	/* the dimm is single sided,

									   so flag as empty */

			    row;	/* this is a double sided dimm

					   to save the next row # */



			/* the dimm is single sided, so flag as empty */

			/* this is a double sided dimm to save the next row #*/

			pvt->map[index + 1] = (value == last) ? 0xff :	row;

			row++;

			last = value;

		}
@@ -1021,8 +1021,8 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	pci_read_config_word(pdev, E752X_REMAPLIMIT, &pci_data);

	pvt->remaplimit = ((u32) pci_data) << 14;

	e752x_printk(KERN_INFO,

		     "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,

		     pvt->remapbase, pvt->remaplimit);

			"tolm = %x, remapbase = %x, remaplimit = %x\n",

			pvt->tolm, pvt->remapbase, pvt->remaplimit);



	/* Here we assume that we will never see multiple instances of this

	 * type of memory controller.  The ID is therefore hardcoded to 0.
@@ -1041,7 +1041,8 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
		printk(KERN_WARNING

			"%s(): Unable to create PCI control\n", __func__);

		printk(KERN_WARNING

		       "%s(): PCI error report via EDAC not setup\n", __func__);

			"%s(): PCI error report via EDAC not setup\n",

			__func__);

	}



	/* get this far and it's successful */

drivers/edac/edac_device.c

+56 −54
Original line number Diff line number Diff line
@@ -454,12 +454,12 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx) 


	/* Report action taken */

	edac_device_printk(edac_dev, KERN_INFO,

			   "Giving out device to module '%s' controller '%s': DEV '%s' (%s)\n",

				"Giving out device to module '%s' controller "

				"'%s': DEV '%s' (%s)\n",

				edac_dev->mod_name,

				edac_dev->ctl_name,

				dev_name(edac_dev),

			   edac_op_state_toString(edac_dev->op_state)

	    );

				edac_op_state_toString(edac_dev->op_state));



	unlock_device_list();

	return 0;
@@ -563,8 +563,9 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, 


	if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) {

		edac_device_printk(edac_dev, KERN_ERR,

				   "INTERNAL ERROR: instance %d 'block' out of range "

				   "(%d >= %d)\n", inst_nr, block_nr,

				"INTERNAL ERROR: instance %d 'block' "

				"out of range (%d >= %d)\n",

				inst_nr, block_nr,

				instance->nr_blocks);

		return;

	}
@@ -609,8 +610,9 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, 


	if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) {

		edac_device_printk(edac_dev, KERN_ERR,

				   "INTERNAL ERROR: instance %d 'block' out of range "

				   "(%d >= %d)\n", inst_nr, block_nr,

				"INTERNAL ERROR: instance %d 'block' "

				"out of range (%d >= %d)\n",

				inst_nr, block_nr,

				instance->nr_blocks);

		return;

	}

drivers/edac/i3000_edac.c

+11 −10
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ static int i3000_is_interleaved(const unsigned char *c0dra, 
	 */

	for (i = 0; i < I3000_RANKS_PER_CHANNEL / 2; i++)

		if (ODD_RANK_ATTRIB(c0dra[i]) != ODD_RANK_ATTRIB(c1dra[i]) ||

		    EVEN_RANK_ATTRIB(c0dra[i]) != EVEN_RANK_ATTRIB(c1dra[i]))

			EVEN_RANK_ATTRIB(c0dra[i]) !=

						EVEN_RANK_ATTRIB(c1dra[i]))

			return 0;



	/* If the rank boundaries for the two channels are different

drivers/edac/i82443bxgx_edac.c

+24 −23
Original line number Diff line number Diff line
@@ -151,8 +151,9 @@ static int i82443bxgx_edacmc_process_error_info(struct mem_ctl_info *mci, 
		error_found = 1;

		if (handle_errors)

			edac_mc_handle_ce(mci, page, pageoffset,

					  /* 440BX/GX don't make syndrome information available */

					  0, edac_mc_find_csrow_by_page(mci, page), 0,	/* channel */

				/* 440BX/GX don't make syndrome information

				 * available */

				0, edac_mc_find_csrow_by_page(mci, page), 0,

				mci->ctl_name);

	}
@@ -233,7 +234,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) 
	debugf0("MC: " __FILE__ ": %s()\n", __func__);



	/* Something is really hosed if PCI config space reads from

	   the MC aren't working.  */

	 * the MC aren't working.

	 */

	if (pci_read_config_dword(pdev, I82443BXGX_NBXCFG, &nbxcfg))

		return -EIO;
@@ -258,8 +260,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) 
		mtype = MEM_RDR;

		break;

	default:

		debugf0

		    ("Unknown/reserved DRAM type value in DRAMC register!\n");

		debugf0("Unknown/reserved DRAM type value "

			"in DRAMC register!\n");

		mtype = -MEM_UNKNOWN;

	}
@@ -288,9 +290,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) 
		edac_mode = EDAC_SECDED;

		break;

	default:

		debugf0

		    ("%s(): Unknown/reserved ECC state in NBXCFG register!\n",

		     __func__);

		debugf0("%s(): Unknown/reserved ECC state "

			"in NBXCFG register!\n", __func__);

		edac_mode = EDAC_UNKNOWN;

		break;

	}

drivers/edac/r82600_edac.c

+12 −11
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ static int r82600_process_error_info(struct mem_ctl_info *mci, 


		if (handle_errors)

			edac_mc_handle_ce(mci, page, 0,	/* not avail */

					  syndrome, edac_mc_find_csrow_by_page(mci, page), 0,	/* channel */

					  mci->ctl_name);

					syndrome,

					edac_mc_find_csrow_by_page(mci, page),

					0, mci->ctl_name);

	}



	if (info->eapr & BIT(1)) {	/* UE? */

drivers/edac/e7xxx_edac.c

+27 −27

File changed.

Contains only whitespace changes.

drivers/edac/edac_device_sysfs.c

+56 −56

File changed.

Contains only whitespace changes.

drivers/edac/edac_mc_sysfs.c

+42 −42

File changed.

Contains only whitespace changes.

drivers/edac/edac_mc.c

+72 −72

File changed.

Contains only whitespace changes.

drivers/edac/edac_pci.c

+17 −17

File changed.

Contains only whitespace changes.

drivers/edac/edac_pci_sysfs.c

+23 −23

File changed.

Contains only whitespace changes.

drivers/edac/i82875p_edac.c

+19 −19

File changed.

Contains only whitespace changes.

drivers/edac/i5000_edac.c

+80 −80

File changed.

Contains only whitespace changes.

drivers/edac/edac_module.c

+5 −5

File changed.

Contains only whitespace changes.

drivers/edac/i82860_edac.c

+12 −12

File changed.

Contains only whitespace changes.

drivers/edac/amd76x_edac.c

+13 −13

File changed.

Contains only whitespace changes.