diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index bbd845885d4f470948281dca5c3112095f2f53de..0843eaa10ec91b421648af0a7837f64648cb1b79 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -17,7 +17,7 @@
 /* MC EDAC Controls, setable by module parameter, and sysfs */
 static int edac_mc_log_ue = 1;
 static int edac_mc_log_ce = 1;
-static int edac_mc_panic_on_ue = 0;
+static int edac_mc_panic_on_ue;
 static int edac_mc_poll_msec = 1000;
 
 /* Getter functions for above */
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c
index d43f9ddc5c49365ac5caeeefe1ae23bb5fd24499..9e7406f28b3bfd5fbfe49710b7aede85c63afe70 100644
--- a/drivers/edac/edac_module.c
+++ b/drivers/edac/edac_module.c
@@ -32,7 +32,7 @@ struct workqueue_struct *edac_workqueue;
 static struct sysdev_class edac_class = {
 	set_kset_name("edac"),
 };
-static int edac_class_valid = 0;
+static int edac_class_valid;
 
 /*
  * edac_op_state_toString()
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index f4f718c764db0b97f1ac80e8e1e33aef7ed6eda3..fd0b1222dc75977e8cd2305101cc1beccbba8b42 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -385,7 +385,7 @@ void edac_pci_generic_check(struct edac_pci_ctl_info *pci)
 	edac_pci_do_parity_check();
 }
 
-static int edac_pci_idx = 0;
+static int edac_pci_idx;
 #define EDAC_PCI_GENCTL_NAME	"EDAC PCI controller"
 
 struct edac_pci_gen_data {
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 804833ce0fefbc3199f73e2b5ea042073625a060..fac94cae2c3d5cb126707c3435a5822c9e3cec03 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -17,8 +17,8 @@
 
 #define EDAC_PCI_SYMLINK	"device"
 
-static int check_pci_errors = 0;	/* default YES check PCI parity */
-static int edac_pci_panic_on_pe = 0;	/* default no panic on PCI Parity */
+static int check_pci_errors;	/* default YES check PCI parity */
+static int edac_pci_panic_on_pe;	/* default no panic on PCI Parity */
 static int edac_pci_log_pe = 1;	/* log PCI parity errors */
 static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
 static atomic_t pci_parity_count = ATOMIC_INIT(0);
diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index d410bf7c44631f69b4a02fe3fdebd1e01b620acf..02cd25a15fd47be0e7944722683a5e89bade2ab9 100644
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -151,7 +151,7 @@ static const struct i3000_dev_info i3000_devs[] = {
 		.ctl_name = "i3000"},
 };
 
-static struct pci_dev *mci_pdev = NULL;
+static struct pci_dev *mci_pdev;
 static int i3000_registered = 1;
 static struct edac_pci_ctl_info *i3000_pci;
 
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 9fdd76e157f873aff271efa1746fa639576bada2..c4c1e76b1270a764c89b6d10597de8de08e2df5d 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -57,7 +57,7 @@ static const struct i82860_dev_info i82860_devs[] = {
 		.ctl_name = "i82860"},
 };
 
-static struct pci_dev *mci_pdev = NULL;	/* init dev: in case that AGP code
+static struct pci_dev *mci_pdev;	/* init dev: in case that AGP code
 					 * has already registered driver
 					 */
 static struct edac_pci_ctl_info *i82860_pci;
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index ce5f0053cdd3d1df5c75623096a42a7c19206129..73a173e2598552a64ea106eb246fa0990c9a97b4 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -177,7 +177,7 @@ static const struct i82875p_dev_info i82875p_devs[] = {
 		.ctl_name = "i82875p"},
 };
 
-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
 					 */
 
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 0a971ebdccec37bfc467ed8f47b66d88a5eaeeb9..eb6090e1b60faf202c05ba11040367d6960970be 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -131,7 +131,7 @@ struct r82600_error_info {
 	u32 eapr;
 };
 
-static unsigned int disable_hardware_scrub = 0;
+static unsigned int disable_hardware_scrub;
 
 static struct edac_pci_ctl_info *r82600_pci;