diff --git a/MAINTAINERS b/MAINTAINERS
index 1d68d83f3120..47ee729524b4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9488,7 +9488,7 @@ F:	drivers/edac/ie31200_edac.c
 
 EDAC-IGEN6
 M:	Tony Luck <tony.luck@intel.com>
-R:	Qiuxu Zhuo <qiuxu.zhuo@intel.com>
+R:	Qiuxu Zhuo <qzhuo@nvidia.com>
 L:	linux-edac@vger.kernel.org
 S:	Maintained
 F:	drivers/edac/igen6_edac.c
@@ -9533,7 +9533,7 @@ F:	drivers/edac/qcom_edac.c
 
 EDAC-SBRIDGE
 M:	Tony Luck <tony.luck@intel.com>
-R:	Qiuxu Zhuo <qiuxu.zhuo@intel.com>
+R:	Qiuxu Zhuo <qzhuo@nvidia.com>
 L:	linux-edac@vger.kernel.org
 S:	Maintained
 F:	drivers/edac/sb_edac.c
diff --git a/drivers/edac/bluefield_edac.c b/drivers/edac/bluefield_edac.c
index ae3bb7afa103..472fc8762778 100644
--- a/drivers/edac/bluefield_edac.c
+++ b/drivers/edac/bluefield_edac.c
@@ -472,8 +472,8 @@ static void bluefield_edac_mc_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id bluefield_mc_acpi_ids[] = {
-	{"MLNXBF08", 0},
-	{}
+	{ .id = "MLNXBF08" },
+	{ }
 };
 
 MODULE_DEVICE_TABLE(acpi, bluefield_mc_acpi_ids);
diff --git a/drivers/edac/loongson_edac.c b/drivers/edac/loongson_edac.c
index 38745800ed01..3ed4d34a3368 100644
--- a/drivers/edac/loongson_edac.c
+++ b/drivers/edac/loongson_edac.c
@@ -137,8 +137,8 @@ static void edac_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id loongson_edac_acpi_match[] = {
-	{"LOON0010", 0},
-	{}
+	{ .id = "LOON0010" },
+	{ }
 };
 MODULE_DEVICE_TABLE(acpi, loongson_edac_acpi_match);