mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

drivers/edac: cleanup spaces-gotos after Lindent messup

Browse source 
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: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Douglas Thompson 2007-07-19 01:50:13 -07:00 committed by Linus Torvalds
parent 6bc7840411
commit 052dfb45cc
16 changed files with 557 additions and 551 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/edac/amd76x_edac.c
View file

@ -283,7 +283,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("%s(): success\n", __func__);
return 0;
fail:
fail:
edac_mc_free(mci);
return -ENODEV;
}

19
drivers/edac/e752x_edac.c
View file

@ -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;
}
@ -910,7 +910,7 @@ static int e752x_get_devs(struct pci_dev *pdev, int dev_idx,
return 0;
fail:
fail:
pci_dev_put(pvt->bridge_ck);
return 1;
}
@ -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,14 +1041,15 @@ 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 */
debugf3("%s(): success\n", __func__);
return 0;
fail:
fail:
pci_dev_put(pvt->dev_d0f0);
pci_dev_put(pvt->dev_d0f1);
pci_dev_put(pvt->bridge_ck);

4
drivers/edac/e7xxx_edac.c
View file

@ -498,10 +498,10 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("%s(): success\n", __func__);
return 0;
fail1:
fail1:
pci_dev_put(pvt->bridge_ck);
fail0:
fail0:
edac_mc_free(mci);
return -ENODEV;

24
drivers/edac/edac_device.c
View file

@ -257,14 +257,14 @@ static int add_edac_dev_to_global_list(struct edac_device_ctl_info *edac_dev)
list_add_tail_rcu(&edac_dev->link, insert_before);
return 0;
fail0:
fail0:
edac_printk(KERN_WARNING, EDAC_MC,
"%s (%s) %s %s already assigned %d\n",
rover->dev->bus_id, dev_name(rover),
rover->mod_name, rover->ctl_name, rover->dev_idx);
return 1;
fail1:
fail1:
edac_printk(KERN_WARNING, EDAC_MC,
"bug in low-level driver: attempt to assign\n"
" duplicate dev_idx %d in %s()\n", rover->dev_idx,
@ -454,21 +454,21 @@ 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;
fail1:
fail1:
/* Some error, so remove the entry from the lsit */
del_edac_device_from_global_list(edac_dev);
fail0:
fail0:
unlock_device_list();
return 1;
}
@ -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;
}

8
drivers/edac/edac_mc.c
View file

@ -334,13 +334,13 @@ static int add_mc_to_global_list(struct mem_ctl_info *mci)
atomic_inc(&edac_handlers);
return 0;
fail0:
fail0:
edac_printk(KERN_WARNING, EDAC_MC,
"%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
return 1;
fail1:
fail1:
edac_printk(KERN_WARNING, EDAC_MC,
"bug in low-level driver: attempt to assign\n"
" duplicate mc_idx %d in %s()\n", p->mc_idx, __func__);
@ -458,10 +458,10 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
mutex_unlock(&mem_ctls_mutex);
return 0;
fail1:
fail1:
del_mc_from_global_list(mci);
fail0:
fail0:
mutex_unlock(&mem_ctls_mutex);
return 1;
}

6
drivers/edac/edac_mc_sysfs.c
View file

@ -531,7 +531,7 @@ static int edac_create_csrow_object(struct kobject *edac_mci_kobj,
}
}
error_exit:
error_exit:
return err;
}
@ -841,7 +841,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
return 0;
/* CSROW error: backout what has already been registered, */
fail1:
fail1:
for (i--; i >= 0; i--) {
if (csrow->nr_pages > 0) {
init_completion(&csrow->kobj_complete);
@ -850,7 +850,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
}
}
fail0:
fail0:
init_completion(&mci->kobj_complete);
kobject_unregister(edac_mci_kobj);
wait_for_completion(&mci->kobj_complete);

6
drivers/edac/edac_module.c
View file

@ -181,11 +181,11 @@ static int __init edac_init(void)
return 0;
/* Error teardown stack */
error_mem:
error_mem:
edac_sysfs_memctrl_teardown();
error_sysfs:
error_sysfs:
edac_unregister_sysfs_edac_name();
error:
error:
return err;
}

8
drivers/edac/edac_pci.c
View file

@ -140,14 +140,14 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci)
list_add_tail_rcu(&pci->link, insert_before);
return 0;
fail0:
fail0:
edac_printk(KERN_WARNING, EDAC_PCI,
"%s (%s) %s %s already assigned %d\n",
rover->dev->bus_id, dev_name(rover),
rover->mod_name, rover->ctl_name, rover->pci_idx);
return 1;
fail1:
fail1:
edac_printk(KERN_WARNING, EDAC_PCI,
"but in low-level driver: attempt to assign\n"
"\tduplicate pci_idx %d in %s()\n", rover->pci_idx,
@ -326,9 +326,9 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx)
edac_unlock_pci_list();
return 0;
fail1:
fail1:
del_edac_pci_from_global_list(pci);
fail0:
fail0:
edac_unlock_pci_list();
return 1;
}

7
drivers/edac/i3000_edac.c
View file

@ -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
@ -476,10 +477,10 @@ static int __init i3000_init(void)
return 0;
fail1:
fail1:
pci_unregister_driver(&i3000_driver);
fail0:
fail0:
if (mci_pdev)
pci_dev_put(mci_pdev);

4
drivers/edac/i5000_edac.c
View file

@ -1392,11 +1392,11 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
return 0;
/* Error exit unwinding stack */
fail1:
fail1:
i5000_put_devices(mci);
fail0:
fail0:
edac_mc_free(mci);
return -ENODEV;
}

19
drivers/edac/i82443bxgx_edac.c
View file

@ -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;
}
@ -332,7 +333,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
return 0;
fail:
fail:
edac_mc_free(mci);
return -ENODEV;
}

6
drivers/edac/i82860_edac.c
View file

@ -230,7 +230,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
return 0;
fail:
fail:
edac_mc_free(mci);
return -ENODEV;
}
@ -318,10 +318,10 @@ static int __init i82860_init(void)
return 0;
fail1:
fail1:
pci_unregister_driver(&i82860_driver);
fail0:
fail0:
if (mci_pdev != NULL)
pci_dev_put(mci_pdev);

14
drivers/edac/i82875p_edac.c
View file

@ -265,7 +265,7 @@ static void i82875p_check(struct mem_ctl_info *mci)
/* Return 0 on success or 1 on failure. */
static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
struct pci_dev **ovrfl_pdev,
void __iomem ** ovrfl_window)
void __iomem **ovrfl_window)
{
struct pci_dev *dev;
void __iomem *window;
@ -316,11 +316,11 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
*ovrfl_window = window;
return 0;
fail1:
fail1:
pci_release_regions(dev);
#ifdef CORRECT_BIOS
fail0:
fail0:
pci_disable_device(dev);
#endif
/* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
@ -441,10 +441,10 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("%s(): success\n", __func__);
return 0;
fail1:
fail1:
edac_mc_free(mci);
fail0:
fail0:
iounmap(ovrfl_window);
pci_release_regions(ovrfl_pdev);
@ -551,10 +551,10 @@ static int __init i82875p_init(void)
return 0;
fail1:
fail1:
pci_unregister_driver(&i82875p_driver);
fail0:
fail0:
if (mci_pdev != NULL)
pci_dev_put(mci_pdev);

7
drivers/edac/r82600_edac.c
View file

@ -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? */
@ -342,7 +343,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("%s(): success\n", __func__);
return 0;
fail:
fail:
edac_mc_free(mci);
return -ENODEV;
}