The patch titled
drivers-edac-new-i82975x-driver-fix
has been removed from the -mm tree. Its filename was
drivers-edac-new-i82975x-driver-fix.patch
This patch was dropped because it was folded into drivers-edac-new-i82975x-driver.patch
------------------------------------------------------
Subject: drivers-edac-new-i82975x-driver-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
multiple coding-style bloopers, all of which checkpatch missed.
Cc: <arvind@xxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Doug Thompson <dougthompson@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Ranganathan Desikan <rdeskan@xxxxxxxxxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/i82975x_edac.c | 111 ++++++++++++++++------------------
1 files changed, 55 insertions(+), 56 deletions(-)
diff -puN drivers/edac/i82975x_edac.c~drivers-edac-new-i82975x-driver-fix drivers/edac/i82975x_edac.c
--- a/drivers/edac/i82975x_edac.c~drivers-edac-new-i82975x-driver-fix
+++ a/drivers/edac/i82975x_edac.c
@@ -230,7 +230,7 @@ static const struct i82975x_dev_info i82
},
};
-static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
+static struct pci_dev *mci_pdev; /* init dev: in case that AGP code has
* already registered driver
*/
@@ -330,20 +330,19 @@ static int dual_channel_active(void __io
* bit-0 will resolve ok in symmetric area of mixed
* (symmetric/asymmetric) configurations
*/
- u8 drb[ 4 ][ 2 ];
+ u8 drb[4][2];
int row;
int dualch;
- for (dualch = 1, row = 0; dualch && ( row < 4 ); row++) {
- drb[ row ][ 0 ] = readb( mch_window + I82975X_DRB + row);
- drb[ row ][ 1 ] = readb( mch_window + I82975X_DRB + row + 0x80);
- dualch = dualch && ( drb[ row ][ 0 ] == drb[ row ][ 1 ] );
+ for (dualch = 1, row = 0; dualch && (row < 4); row++) {
+ drb[row][0] = readb(mch_window + I82975X_DRB + row);
+ drb[row][1] = readb(mch_window + I82975X_DRB + row + 0x80);
+ dualch = dualch && (drb[row][0] == drb[row][1]);
}
return dualch;
}
-static enum dev_type i82975x_dram_type(void __iomem *mch_window,
- int rank)
+static enum dev_type i82975x_dram_type(void __iomem *mch_window, int rank)
{
/*
* ASUS P5W DH either does not program this register or programs
@@ -404,7 +403,7 @@ static void i82975x_init_csrows(struct m
/* #define i82975x_DEBUG_IOMEM */
-#ifdef i82975x_DEBUG_IOMEM
+#ifdef i82975x_DEBUG_IOMEM
static void i82975x_print_dram_timings(void __iomem *mch_window)
{
/*
@@ -413,24 +412,24 @@ static void i82975x_print_dram_timings(v
* Asus P5W Bios reports 15-5-4-4
* What's your religion?
*/
- static const int caslats[ 4 ] = { 5, 4, 3, 6 };
- u32 dtreg[ 2 ];
+ static const int caslats[4] = { 5, 4, 3, 6 };
+ u32 dtreg[2];
- dtreg[ 0 ] = readl( mch_window + 0x114 );
- dtreg[ 1 ] = readl( mch_window + 0x194 );
+ dtreg[0] = readl(mch_window + 0x114);
+ dtreg[1] = readl(mch_window + 0x194);
i82975x_printk(KERN_INFO, "DRAM Timings : Ch0 Ch1\n"
" RAS Active Min = %d %d\n"
" CAS latency = %d %d\n"
" RAS to CAS = %d %d\n"
" RAS precharge = %d %d\n",
- ( dtreg[ 0 ] >> 19 ) & 0x0f,
- ( dtreg[ 1 ] >> 19 ) & 0x0f,
- caslats[ ( dtreg[ 0 ] >> 8 ) & 0x03 ],
- caslats[ ( dtreg[ 1 ] >> 8 ) & 0x03 ],
- ( ( dtreg[ 0 ] >> 4 ) & 0x07 ) + 2,
- ( ( dtreg[ 1 ] >> 4 ) & 0x07 ) + 2,
- ( dtreg[ 0 ] & 0x07 ) + 2,
- ( dtreg[ 1 ] & 0x07 ) + 2
+ (dtreg[0] >> 19 ) & 0x0f,
+ (dtreg[1] >> 19) & 0x0f,
+ caslats[(dtreg[0] >> 8) & 0x03],
+ caslats[(dtreg[1] >> 8) & 0x03],
+ ((dtreg[0] >> 4) & 0x07) + 2,
+ ((dtreg[1] >> 4) & 0x07) + 2,
+ (dtreg[0] & 0x07) + 2,
+ (dtreg[1] & 0x07) + 2
);
}
@@ -443,72 +442,72 @@ static int i82975x_probe1(struct pci_dev
struct i82975x_pvt *pvt;
void __iomem *mch_window;
u32 mchbar;
- u32 drc[ 2 ];
+ u32 drc[2];
struct i82975x_error_info discard;
int chans;
#ifdef i82975x_DEBUG_IOMEM
- u8 c0drb[ 4 ];
- u8 c1drb[ 4 ];
+ u8 c0drb[4];
+ u8 c1drb[4];
#endif
debugf0("%s()\n", __func__);
pci_read_config_dword(pdev, I82975X_MCHBAR, &mchbar);
- if (!(mchbar & 1 )) {
+ if (!(mchbar & 1)) {
debugf3("%s(): failed, MCHBAR disabled!\n", __func__);
goto fail0;
}
mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */
- mch_window = ioremap_nocache( mchbar, 0x1000 );
+ mch_window = ioremap_nocache(mchbar, 0x1000);
#ifdef i82975x_DEBUG_IOMEM
i82975x_printk(KERN_INFO, "MCHBAR real = %0x, remapped = %p\n",
mchbar, mch_window);
- c0drb[ 0 ] = readb( mch_window + I82975X_DRB_CH0R0);
- c0drb[ 1 ] = readb( mch_window + I82975X_DRB_CH0R1);
- c0drb[ 2 ] = readb( mch_window + I82975X_DRB_CH0R2);
- c0drb[ 3 ] = readb( mch_window + I82975X_DRB_CH0R3);
- c1drb[ 0 ] = readb( mch_window + I82975X_DRB_CH1R0);
- c1drb[ 1 ] = readb( mch_window + I82975X_DRB_CH1R1);
- c1drb[ 2 ] = readb( mch_window + I82975X_DRB_CH1R2);
- c1drb[ 3 ] = readb( mch_window + I82975X_DRB_CH1R3);
- i82975x_printk(KERN_INFO, "DRBCH0R0 = 0x%02x\n", c0drb[ 0 ]);
- i82975x_printk(KERN_INFO, "DRBCH0R1 = 0x%02x\n", c0drb[ 1 ]);
- i82975x_printk(KERN_INFO, "DRBCH0R2 = 0x%02x\n", c0drb[ 2 ]);
- i82975x_printk(KERN_INFO, "DRBCH0R3 = 0x%02x\n", c0drb[ 3 ]);
- i82975x_printk(KERN_INFO, "DRBCH1R0 = 0x%02x\n", c1drb[ 0 ]);
- i82975x_printk(KERN_INFO, "DRBCH1R1 = 0x%02x\n", c1drb[ 1 ]);
- i82975x_printk(KERN_INFO, "DRBCH1R2 = 0x%02x\n", c1drb[ 2 ]);
- i82975x_printk(KERN_INFO, "DRBCH1R3 = 0x%02x\n", c1drb[ 3 ]);
+ c0drb[0] = readb(mch_window + I82975X_DRB_CH0R0);
+ c0drb[1] = readb(mch_window + I82975X_DRB_CH0R1);
+ c0drb[2] = readb(mch_window + I82975X_DRB_CH0R2);
+ c0drb[3] = readb(mch_window + I82975X_DRB_CH0R3);
+ c1drb[0] = readb(mch_window + I82975X_DRB_CH1R0);
+ c1drb[1] = readb(mch_window + I82975X_DRB_CH1R1);
+ c1drb[2] = readb(mch_window + I82975X_DRB_CH1R2);
+ c1drb[3] = readb(mch_window + I82975X_DRB_CH1R3);
+ i82975x_printk(KERN_INFO, "DRBCH0R0 = 0x%02x\n", c0drb[0]);
+ i82975x_printk(KERN_INFO, "DRBCH0R1 = 0x%02x\n", c0drb[1]);
+ i82975x_printk(KERN_INFO, "DRBCH0R2 = 0x%02x\n", c0drb[2]);
+ i82975x_printk(KERN_INFO, "DRBCH0R3 = 0x%02x\n", c0drb[3]);
+ i82975x_printk(KERN_INFO, "DRBCH1R0 = 0x%02x\n", c1drb[0]);
+ i82975x_printk(KERN_INFO, "DRBCH1R1 = 0x%02x\n", c1drb[1]);
+ i82975x_printk(KERN_INFO, "DRBCH1R2 = 0x%02x\n", c1drb[2]);
+ i82975x_printk(KERN_INFO, "DRBCH1R3 = 0x%02x\n", c1drb[3]);
#endif
- drc[ 0 ] = readl( mch_window + I82975X_DRC_CH0M0 );
- drc[ 1 ] = readl( mch_window + I82975X_DRC_CH1M0 );
+ drc[0] = readl(mch_window + I82975X_DRC_CH0M0);
+ drc[1] = readl(mch_window + I82975X_DRC_CH1M0);
#ifdef i82975x_DEBUG_IOMEM
- i82975x_printk(KERN_INFO, "DRC_CH0 = %0x, %s\n", drc[ 0 ],
- ( ( drc[ 0 ] >> 21 ) & 3 ) == 1 ?
- "ECC enabled" : "ECC disabled" );
- i82975x_printk(KERN_INFO, "DRC_CH1 = %0x, %s\n", drc[ 1 ],
- ( ( drc[ 1 ] >> 21 ) & 3 ) == 1 ?
- "ECC enabled" : "ECC disabled" );
+ i82975x_printk(KERN_INFO, "DRC_CH0 = %0x, %s\n", drc[0],
+ ((drc[0] >> 21) & 3) == 1 ?
+ "ECC enabled" : "ECC disabled");
+ i82975x_printk(KERN_INFO, "DRC_CH1 = %0x, %s\n", drc[1],
+ ((drc[1] >> 21) & 3) == 1 ?
+ "ECC enabled" : "ECC disabled");
i82975x_printk(KERN_INFO, "C0 BNKARC = %0x\n",
- readw( mch_window + I82975X_C0BNKARC ) );
+ readw(mch_window + I82975X_C0BNKARC));
i82975x_printk(KERN_INFO, "C1 BNKARC = %0x\n",
- readw( mch_window + I82975X_C1BNKARC ) );
- i82975x_print_dram_timings( mch_window );
+ readw(mch_window + I82975X_C1BNKARC));
+ i82975x_print_dram_timings(mch_window);
goto fail1;
#endif
- if (!(((drc[ 0 ] >> 21) & 3) == 1 || ((drc[ 1 ] >> 21) & 3) == 1 )) {
+ if (!(((drc[0] >> 21) & 3) == 1 || ((drc[1] >> 21) & 3) == 1)) {
i82975x_printk(KERN_INFO, "ECC disabled on both channels.\n");
goto fail1;
}
- chans = dual_channel_active( mch_window ) + 1;
+ chans = dual_channel_active(mch_window) + 1;
/* assuming only one controller, index thus is 0 */
- mci = edac_mc_alloc(sizeof(*pvt), I82975X_NR_CSROWS( chans ),
+ mci = edac_mc_alloc(sizeof(*pvt), I82975X_NR_CSROWS(chans),
chans, 0);
if (!mci) {
rc = -ENOMEM;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-merge-populate-and-nopage-into-fault-fixes-nonlinear.patch
mm-fault-feedback-2.patch
freezer-run-show_state-when-freezing-times-out.patch
pm-introduce-hibernation-and-suspend-notifiers.patch
pm-disable-usermode-helper-before-hibernation-and-suspend.patch
kernel-doc-fix-leading-dot-in-man-mode-output.patch
coredump-masking-reimplementation-of-dumpable-using-two-flags.patch
lockstat-core-infrastructure.patch
lockstat-human-readability-tweaks.patch
lockdep-various-fixes.patch
lockstat-measure-lock-bouncing.patch
some-kmalloc-memset-kzalloc-tree-wide.patch
dequeue_huge_page-warning-fix.patch
lguest-the-host-code.patch
lguest-the-net-driver.patch
drivers-edac-new-i82443bxgz-mc-driver-broken.patch
drivers-edac-fix-e752x-reversed-csrows.patch
drivers-edac-new-pasemi-driver.patch
drivers-edac-new-i82975x-driver.patch
drivers-edac-new-i82975x-driver-fix.patch
kernel-sysctlc-finish-off-the-warning-comments.patch
afs-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
