* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 9:33 Doug Thompson
0 siblings, 0 replies; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 9:33 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 9:33 Doug Thompson
0 siblings, 0 replies; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 9:33 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 9:34 Doug Thompson
2007-06-03 10:06 ` WANG Cong
0 siblings, 1 reply; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 9:34 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 23/36] drivers edac Lindent amd76x driver
2007-06-03 9:34 [PATCH 23/36] drivers edac Lindent amd76x driver Doug Thompson
@ 2007-06-03 10:06 ` WANG Cong
0 siblings, 0 replies; 10+ messages in thread
From: WANG Cong @ 2007-06-03 10:06 UTC (permalink / raw)
To: Doug Thompson; +Cc: linux-kernel, Andrew Morton, Alan Cox
On Sun, Jun 03, 2007 at 02:34:03AM -0700, Doug Thompson wrote:
>From: Douglas Thompson <dougthompson@xmission.com>
>
>Run this driver through Lindent for cleanup
>
>Signed-off-by: Dave Jiang <djiang@mvista.com>
>Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
>---
> amd76x_edac.c | 54
>+++++++++++++++++++++++++-----------------------------
> 1 file changed, 25 insertions(+), 29 deletions(-)
>---
>
>Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
>===================================================================
>--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
>+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
>@@ -86,11 +86,9 @@ struct amd76x_dev_info {
>
> static const struct amd76x_dev_info amd76x_devs[] = {
> [AMD761] = {
>- .ctl_name = "AMD761"
>- },
>+ .ctl_name = "AMD761"},
> [AMD762] = {
>- .ctl_name = "AMD762"
>- },
>+ .ctl_name = "AMD762"},
> };
>
> /**
>@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
> * on the chip so that further errors will be reported
> */
> static void amd76x_get_error_info(struct mem_ctl_info *mci,
>- struct amd76x_error_info *info)
>+ struct amd76x_error_info *info)
> {
> struct pci_dev *pdev;
>
> pdev = to_pci_dev(mci->dev);
> pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
>- &info->ecc_mode_status);
>+ &info->ecc_mode_status);
>
> if (info->ecc_mode_status & BIT(8))
> pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
>- (u32) BIT(8), (u32) BIT(8));
>+ (u32) BIT(8), (u32) BIT(8));
>
> if (info->ecc_mode_status & BIT(9))
> pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
>- (u32) BIT(9), (u32) BIT(9));
>+ (u32) BIT(9), (u32) BIT(9));
> }
>
> /**
>@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
> * then attempt to handle and clean up after the error
> */
> static int amd76x_process_error_info(struct mem_ctl_info *mci,
>- struct amd76x_error_info *info, int handle_errors)
>+ struct amd76x_error_info *info,
>+ int handle_errors)
> {
> int error_found;
> u32 row;
>@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
> error_found = 0;
>
> /*
>- * Check for an uncorrectable error
>+ * Check for an uncorrectable error
> */
> if (info->ecc_mode_status & BIT(8)) {
> error_found = 1;
>@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
> if (handle_errors) {
> row = (info->ecc_mode_status >> 4) & 0xf;
> edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
>- row, mci->ctl_name);
>+ row, mci->ctl_name);
> }
> }
>
> /*
>- * Check for a correctable error
>+ * Check for a correctable error
> */
> if (info->ecc_mode_status & BIT(9)) {
> error_found = 1;
>@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
> if (handle_errors) {
> row = info->ecc_mode_status & 0xf;
> edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
>- 0, row, 0, mci->ctl_name);
>+ 0, row, 0, mci->ctl_name);
> }
> }
>
>@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
> }
>
> static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
>pci_dev *pdev,
>- enum edac_type edac_mode)
>+ enum edac_type edac_mode)
> {
> struct csrow_info *csrow;
> u32 mba, mba_base, mba_mask, dms;
>@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
>
> /* find the DRAM Chip Select Base address and mask */
> pci_read_config_dword(pdev,
>- AMD76X_MEM_BASE_ADDR + (index * 4),
>- &mba);
>+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
>
> if (!(mba & BIT(0)))
> continue;
>@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
> mci->mtype_cap = MEM_FLAG_RDDR;
> mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
> mci->edac_cap = ems_mode ?
>- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
>+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
> mci->mod_name = EDAC_MOD_STR;
> mci->mod_ver = AMD76X_REVISION;
> mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
>@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
> mci->ctl_page_to_phys = NULL;
>
> amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
>- amd76x_get_error_info(mci, &discard); /* clear counters */
>+ amd76x_get_error_info(mci, &discard); /* clear counters */
>
> /* Here we assume that we will never see multiple instances of this
> * type of memory controller. The ID is therefore hardcoded to 0.
> */
>- if (edac_mc_add_mc(mci,0)) {
>+ if (edac_mc_add_mc(mci, 0)) {
> debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
> goto fail;
> }
>@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
> debugf3("%s(): success\n", __func__);
> return 0;
>
>-fail:
>+ fail:
> edac_mc_free(mci);
> return -ENODEV;
> }
>
I wonder whether Lindent is always use whitespaces, not tabs, before a label.
I think this should be fixed manually. And it seems that there shouldn't be any spaces before the label 'fail' in this context.
Regards!
WANG Cong
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 14:42 Doug Thompson
0 siblings, 0 replies; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 14:42 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup purposes
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 15:11 Doug Thompson
2007-06-03 15:17 ` Simon Arlott
0 siblings, 1 reply; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 15:11 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup purposes
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 23/36] drivers edac Lindent amd76x driver
2007-06-03 15:11 Doug Thompson
@ 2007-06-03 15:17 ` Simon Arlott
2007-06-03 15:22 ` Jan Engelhardt
2007-06-03 15:27 ` Doug Thompson
0 siblings, 2 replies; 10+ messages in thread
From: Simon Arlott @ 2007-06-03 15:17 UTC (permalink / raw)
To: Doug Thompson; +Cc: linux-kernel, Andrew Morton, Alan Cox
On 03/06/07 16:11, Doug Thompson wrote:
> Run this driver through Lindent for cleanup purposes
> amd76x_edac.c | 54
> 1 file changed, 25 insertions(+), 29 deletions(-)
> --- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
> +++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
> @@ -86,11 +86,9 @@ struct amd76x_dev_info {
>
> static const struct amd76x_dev_info amd76x_devs[] = {
> [AMD761] = {
> - .ctl_name = "AMD761"
> - },
> + .ctl_name = "AMD761"},
> [AMD762] = {
> - .ctl_name = "AMD762"
> - },
> + .ctl_name = "AMD762"},
> };
>
You're adding a *lot* of spaces...
>From CodingStyle: "Outside of comments, documentation and except in
Kconfig, spaces are never used for indentation".
--
Simon Arlott
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 23/36] drivers edac Lindent amd76x driver
2007-06-03 15:17 ` Simon Arlott
@ 2007-06-03 15:22 ` Jan Engelhardt
2007-06-03 15:27 ` Doug Thompson
1 sibling, 0 replies; 10+ messages in thread
From: Jan Engelhardt @ 2007-06-03 15:22 UTC (permalink / raw)
To: Simon Arlott; +Cc: Doug Thompson, linux-kernel, Andrew Morton, Alan Cox
On Jun 3 2007 16:17, Simon Arlott wrote:
>On 03/06/07 16:11, Doug Thompson wrote:
>> Run this driver through Lindent for cleanup purposes
>> amd76x_edac.c | 54
>> 1 file changed, 25 insertions(+), 29 deletions(-)
>> --- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
>> +++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
>> @@ -86,11 +86,9 @@ struct amd76x_dev_info {
>>
>> static const struct amd76x_dev_info amd76x_devs[] = {
>> [AMD761] = {
>> - .ctl_name = "AMD761"
>> - },
>> + .ctl_name = "AMD761"},
>> [AMD762] = {
>> - .ctl_name = "AMD762"
>> - },
>> + .ctl_name = "AMD762"},
>> };
>>
>
>You're adding a *lot* of spaces...
scripts/checkpatch.pl to the resuce.
Jan
--
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 23/36] drivers edac Lindent amd76x driver
2007-06-03 15:17 ` Simon Arlott
2007-06-03 15:22 ` Jan Engelhardt
@ 2007-06-03 15:27 ` Doug Thompson
1 sibling, 0 replies; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 15:27 UTC (permalink / raw)
To: Simon Arlott; +Cc: linux-kernel, Andrew Morton, Alan Cox
--- Simon Arlott <simon@fire.lp0.eu> wrote:
> On 03/06/07 16:11, Doug Thompson wrote:
> > Run this driver through Lindent for cleanup purposes
> > amd76x_edac.c | 54
> > 1 file changed, 25 insertions(+), 29 deletions(-)
> > --- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
> > +++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
> > @@ -86,11 +86,9 @@ struct amd76x_dev_info {
> >
> > static const struct amd76x_dev_info amd76x_devs[] = {
> > [AMD761] = {
> > - .ctl_name = "AMD761"
> > - },
> > + .ctl_name = "AMD761"},
> > [AMD762] = {
> > - .ctl_name = "AMD762"
> > - },
> > + .ctl_name = "AMD762"},
> > };
> >
>
> You're adding a *lot* of spaces...
Yeah, that is weird - There were 2 tabs and Lindent ADDED 4 spaces on
top of that. I understood that Lindent has problems with 'gotos',
didn't know it had issues like this one.
doug t
>
> From CodingStyle: "Outside of comments, documentation and except in
> Kconfig, spaces are never used for indentation".
>
> --
> Simon Arlott
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 23/36] drivers edac Lindent amd76x driver
@ 2007-06-03 17:18 Doug Thompson
0 siblings, 0 replies; 10+ messages in thread
From: Doug Thompson @ 2007-06-03 17:18 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Alan Cox
From: Douglas Thompson <dougthompson@xmission.com>
Run this driver through Lindent for cleanup purposes
Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
---
amd76x_edac.c | 54
+++++++++++++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 29 deletions(-)
---
Index: linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/edac/amd76x_edac.c
+++ linux-2.6.22-rc1/drivers/edac/amd76x_edac.c
@@ -86,11 +86,9 @@ struct amd76x_dev_info {
static const struct amd76x_dev_info amd76x_devs[] = {
[AMD761] = {
- .ctl_name = "AMD761"
- },
+ .ctl_name = "AMD761"},
[AMD762] = {
- .ctl_name = "AMD762"
- },
+ .ctl_name = "AMD762"},
};
/**
@@ -102,21 +100,21 @@ static const struct amd76x_dev_info amd7
* on the chip so that further errors will be reported
*/
static void amd76x_get_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info)
+ struct amd76x_error_info *info)
{
struct pci_dev *pdev;
pdev = to_pci_dev(mci->dev);
pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
- &info->ecc_mode_status);
+ &info->ecc_mode_status);
if (info->ecc_mode_status & BIT(8))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(8), (u32) BIT(8));
+ (u32) BIT(8), (u32) BIT(8));
if (info->ecc_mode_status & BIT(9))
pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,
- (u32) BIT(9), (u32) BIT(9));
+ (u32) BIT(9), (u32) BIT(9));
}
/**
@@ -130,7 +128,8 @@ static void amd76x_get_error_info(struct
* then attempt to handle and clean up after the error
*/
static int amd76x_process_error_info(struct mem_ctl_info *mci,
- struct amd76x_error_info *info, int handle_errors)
+ struct amd76x_error_info *info,
+ int handle_errors)
{
int error_found;
u32 row;
@@ -138,7 +137,7 @@ static int amd76x_process_error_info(str
error_found = 0;
/*
- * Check for an uncorrectable error
+ * Check for an uncorrectable error
*/
if (info->ecc_mode_status & BIT(8)) {
error_found = 1;
@@ -146,12 +145,12 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = (info->ecc_mode_status >> 4) & 0xf;
edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
- row, mci->ctl_name);
+ row, mci->ctl_name);
}
}
/*
- * Check for a correctable error
+ * Check for a correctable error
*/
if (info->ecc_mode_status & BIT(9)) {
error_found = 1;
@@ -159,7 +158,7 @@ static int amd76x_process_error_info(str
if (handle_errors) {
row = info->ecc_mode_status & 0xf;
edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
- 0, row, 0, mci->ctl_name);
+ 0, row, 0, mci->ctl_name);
}
}
@@ -182,7 +181,7 @@ static void amd76x_check(struct mem_ctl_
}
static void amd76x_init_csrows(struct mem_ctl_info *mci, struct
pci_dev *pdev,
- enum edac_type edac_mode)
+ enum edac_type edac_mode)
{
struct csrow_info *csrow;
u32 mba, mba_base, mba_mask, dms;
@@ -193,8 +192,7 @@ static void amd76x_init_csrows(struct me
/* find the DRAM Chip Select Base address and mask */
pci_read_config_dword(pdev,
- AMD76X_MEM_BASE_ADDR + (index * 4),
- &mba);
+ AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
if (!(mba & BIT(0)))
continue;
@@ -249,7 +247,7 @@ static int amd76x_probe1(struct pci_dev
mci->mtype_cap = MEM_FLAG_RDDR;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->edac_cap = ems_mode ?
- (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
+ (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
mci->mod_name = EDAC_MOD_STR;
mci->mod_ver = AMD76X_REVISION;
mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -258,12 +256,12 @@ static int amd76x_probe1(struct pci_dev
mci->ctl_page_to_phys = NULL;
amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);
- amd76x_get_error_info(mci, &discard); /* clear counters */
+ amd76x_get_error_info(mci, &discard); /* clear counters */
/* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0.
*/
- if (edac_mc_add_mc(mci,0)) {
+ if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail;
}
@@ -272,14 +270,14 @@ static int amd76x_probe1(struct pci_dev
debugf3("%s(): success\n", __func__);
return 0;
-fail:
+ fail:
edac_mc_free(mci);
return -ENODEV;
}
/* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
debugf0("%s()\n", __func__);
@@ -309,16 +307,14 @@ static void __devexit amd76x_remove_one(
static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
{
- PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD762
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
{
- PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- AMD761
- },
+ PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD761},
{
- 0,
- } /* 0 terminated list. */
+ 0,
+ } /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-06-03 17:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-03 9:34 [PATCH 23/36] drivers edac Lindent amd76x driver Doug Thompson
2007-06-03 10:06 ` WANG Cong
-- strict thread matches above, loose matches on Subject: below --
2007-06-03 17:18 Doug Thompson
2007-06-03 15:11 Doug Thompson
2007-06-03 15:17 ` Simon Arlott
2007-06-03 15:22 ` Jan Engelhardt
2007-06-03 15:27 ` Doug Thompson
2007-06-03 14:42 Doug Thompson
2007-06-03 9:33 Doug Thompson
2007-06-03 9:33 Doug Thompson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox