Skip to content

Commit

Permalink
amd64_edac: misc small cleanups
Browse files Browse the repository at this point in the history
- cleanup debug calls
- shorten function names
- cleanup error exit paths

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  • Loading branch information
Borislav Petkov committed Jun 26, 2009
1 parent 30c875c commit 37da045
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 additions & 6 deletions drivers/edac/amd64_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ static int f10_early_channel_count(struct amd64_pvt *pvt)
if (channels == 0)
channels = 1;

debugf0("DIMM count= %d\n", channels);
debugf0("MCT channel count: %d\n", channels);

return channels;

Expand Down Expand Up @@ -3056,7 +3056,7 @@ static int amd64_probe_one_instance(struct pci_dev *dram_f2_ctl,
if (!pvt)
goto err_exit;

pvt->mc_node_id = get_mc_node_id_from_pdev(dram_f2_ctl);
pvt->mc_node_id = get_node_id(dram_f2_ctl);

pvt->dram_f2_ctl = dram_f2_ctl;
pvt->ext_model = boot_cpu_data.x86_model >> 4;
Expand Down Expand Up @@ -3183,8 +3183,7 @@ static int __devinit amd64_init_one_instance(struct pci_dev *pdev,
{
int ret = 0;

debugf0("(MC node=%d,mc_type='%s')\n",
get_mc_node_id_from_pdev(pdev),
debugf0("(MC node=%d,mc_type='%s')\n", get_node_id(pdev),
get_amd_family_name(mc_type->driver_data));

ret = pci_enable_device(pdev);
Expand Down Expand Up @@ -3323,15 +3322,17 @@ static int __init amd64_edac_init(void)

err = amd64_init_2nd_stage(pvt_lookup[nb]);
if (err)
goto err_exit;
goto err_2nd_stage;
}

amd64_setup_pci_device();

return 0;

err_2nd_stage:
debugf0("2nd stage failed\n");

err_exit:
debugf0("'finish_setup' stage failed\n");
pci_unregister_driver(&amd64_pci_driver);

return err;
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/amd64_edac.h
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ enum {
#define K8_MSR_MC4ADDR 0x0412

/* AMD sets the first MC device at device ID 0x18. */
static inline int get_mc_node_id_from_pdev(struct pci_dev *pdev)
static inline int get_node_id(struct pci_dev *pdev)
{
return PCI_SLOT(pdev->devfn) - 0x18;
}
Expand Down

0 comments on commit 37da045

Please sign in to comment.