From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbdF2KDv (ORCPT ); Thu, 29 Jun 2017 06:03:51 -0400 Received: from mail.skyhub.de ([5.9.137.197]:42740 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbdF2KDm (ORCPT ); Thu, 29 Jun 2017 06:03:42 -0400 Date: Thu, 29 Jun 2017 12:03:11 +0200 From: Borislav Petkov To: linux-edac Cc: Thor Thayer , Mark Gross , Robert Richter , Tim Small , Ranganathan Desikan , "Arvind R." , Jason Baron , Tony Luck , Michal Simek , =?utf-8?B?U8O2cmVu?= Brinkmann , Ralf Baechle , David Daney , Loc Ho , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org Subject: [PATCH] EDAC: Get rid of mci->mod_ver Message-ID: <20170629100311.vmdq6fojpo5ye4ne@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, any objections? --- It is a write-only variable so get rid of it. Signed-off-by: Borislav Petkov Cc: Thor Thayer Cc: Mark Gross Cc: Robert Richter Cc: Tim Small Cc: Ranganathan Desikan Cc: "Arvind R." Cc: Jason Baron Cc: Tony Luck Cc: Michal Simek Cc: "Sören Brinkmann" Cc: Ralf Baechle Cc: David Daney Cc: Loc Ho Cc: linux-edac@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mips@linux-mips.org --- drivers/edac/altera_edac.c | 2 -- drivers/edac/amd64_edac.c | 1 - drivers/edac/amd76x_edac.c | 2 -- drivers/edac/cpc925_edac.c | 1 - drivers/edac/e752x_edac.c | 2 -- drivers/edac/e7xxx_edac.c | 2 -- drivers/edac/ghes_edac.c | 3 --- drivers/edac/highbank_mc_edac.c | 1 - drivers/edac/i3000_edac.c | 3 --- drivers/edac/i3200_edac.c | 3 --- drivers/edac/i5000_edac.c | 1 - drivers/edac/i5100_edac.c | 1 - drivers/edac/i5400_edac.c | 1 - drivers/edac/i7300_edac.c | 1 - drivers/edac/i7core_edac.c | 1 - drivers/edac/i82443bxgx_edac.c | 3 --- drivers/edac/i82860_edac.c | 2 -- drivers/edac/i82875p_edac.c | 2 -- drivers/edac/i82975x_edac.c | 2 -- drivers/edac/ie31200_edac.c | 2 -- drivers/edac/mv64x60_edac.c | 1 - drivers/edac/ppc4xx_edac.c | 1 - drivers/edac/r82600_edac.c | 2 -- drivers/edac/sb_edac.c | 1 - drivers/edac/skx_edac.c | 3 --- drivers/edac/synopsys_edac.c | 1 - drivers/edac/thunderx_edac.c | 1 - drivers/edac/x38_edac.c | 3 --- drivers/edac/xgene_edac.c | 1 - include/linux/edac.h | 1 - 30 files changed, 51 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index db75d4b614f7..fa2e5db56d24 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -38,7 +38,6 @@ #include "edac_module.h" #define EDAC_MOD_STR "altera_edac" -#define EDAC_VERSION "1" #define EDAC_DEVICE "Altera" static const struct altr_sdram_prv_data c5_data = { @@ -392,7 +391,6 @@ static int altr_sdram_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = EDAC_VERSION; mci->ctl_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_SW_SRC; mci->dev_name = dev_name(&pdev->dev); diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 3aea55698165..ac2f30295efe 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3130,7 +3130,6 @@ static void setup_mci_misc_attrs(struct mem_ctl_info *mci, mci->edac_cap = determine_edac_cap(pvt); mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = EDAC_AMD64_VERSION; mci->ctl_name = fam->ctl_name; mci->dev_name = pci_name(pvt->F3); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index a7450275ad28..9c6e326b4c14 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c @@ -19,7 +19,6 @@ #include #include "edac_module.h" -#define AMD76X_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "amd76x_edac" #define amd76x_printk(level, fmt, arg...) \ @@ -263,7 +262,6 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = ems_mode ? (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; mci->dev_name = pci_name(pdev); mci->edac_check = amd76x_check; diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c index 837b62c4993d..cba8ee14a067 100644 --- a/drivers/edac/cpc925_edac.c +++ b/drivers/edac/cpc925_edac.c @@ -999,7 +999,6 @@ static int cpc925_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = CPC925_EDAC_MOD_STR; - mci->mod_ver = CPC925_EDAC_REVISION; mci->ctl_name = pdev->name; if (edac_op_state == EDAC_OPSTATE_POLL) diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 1a352cae1f52..b5de9a13ea3f 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c @@ -26,7 +26,6 @@ #include #include "edac_module.h" -#define E752X_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "e752x_edac" static int report_non_memory_errors; @@ -1303,7 +1302,6 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) (EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED); /* FIXME - what if different memory types are in different csrows? */ mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = E752X_REVISION; mci->pdev = &pdev->dev; edac_dbg(3, "init pvt\n"); diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 67ef07aed923..75d7ce62b3be 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c @@ -32,7 +32,6 @@ #include #include "edac_module.h" -#define E7XXX_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "e7xxx_edac" #define e7xxx_printk(level, fmt, arg...) \ @@ -458,7 +457,6 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) EDAC_FLAG_S4ECD4ED; /* FIXME - what if different memory types are in different csrows? */ mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = E7XXX_REVISION; mci->pdev = &pdev->dev; edac_dbg(3, "init pvt\n"); pvt = (struct e7xxx_pvt *)mci->pvt_info; diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 4e61a6229dd2..6f80eb65c26c 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -17,8 +17,6 @@ #include "edac_module.h" #include -#define GHES_EDAC_REVISION " Ver: 1.0.0" - struct ghes_edac_pvt { struct list_head list; struct ghes *ghes; @@ -451,7 +449,6 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "ghes_edac.c"; - mci->mod_ver = GHES_EDAC_REVISION; mci->ctl_name = "ghes_edac"; mci->dev_name = "ghes"; diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c index 0e7e0a404d89..6092e61be605 100644 --- a/drivers/edac/highbank_mc_edac.c +++ b/drivers/edac/highbank_mc_edac.c @@ -224,7 +224,6 @@ static int highbank_mc_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = pdev->dev.driver->name; - mci->mod_ver = "1"; mci->ctl_name = id->compatible; mci->dev_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_SW_SRC; diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c index 5306240570d7..8085a32ec3bd 100644 --- a/drivers/edac/i3000_edac.c +++ b/drivers/edac/i3000_edac.c @@ -16,8 +16,6 @@ #include #include "edac_module.h" -#define I3000_REVISION "1.1" - #define EDAC_MOD_STR "i3000_edac" #define I3000_RANKS 8 @@ -375,7 +373,6 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I3000_REVISION; mci->ctl_name = i3000_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i3000_check; diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index 77c58d201a30..d92d56cee101 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c @@ -17,8 +17,6 @@ #include -#define I3200_REVISION "1.1" - #define EDAC_MOD_STR "i3200_edac" #define PCI_DEVICE_ID_INTEL_3200_HB 0x29f0 @@ -375,7 +373,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I3200_REVISION; mci->ctl_name = i3200_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i3200_check; diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 8f5a56e25bd2..53f24b18cd61 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -1430,7 +1430,6 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i5000_edac.c"; - mci->mod_ver = I5000_REVISION; mci->ctl_name = i5000_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c index a8334c4acea7..b506eef6b146 100644 --- a/drivers/edac/i5100_edac.c +++ b/drivers/edac/i5100_edac.c @@ -1108,7 +1108,6 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = "i5100_edac.c"; - mci->mod_ver = "not versioned"; mci->ctl_name = "i5100"; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c index cd889edc8516..6f8bcdb9256a 100644 --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c @@ -1315,7 +1315,6 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i5400_edac.c"; - mci->mod_ver = I5400_REVISION; mci->ctl_name = i5400_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index e391f5a716be..6b5a554ba8e4 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -1077,7 +1077,6 @@ static int i7300_init_one(struct pci_dev *pdev, const struct pci_device_id *id) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i7300_edac.c"; - mci->mod_ver = I7300_REVISION; mci->ctl_name = i7300_devs[0].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 75ad847593b7..98998ef58647 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -2159,7 +2159,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i7core_edac.c"; - mci->mod_ver = I7CORE_REVISION; mci->ctl_name = kasprintf(GFP_KERNEL, "i7 core #%d", i7core_dev->socket); mci->dev_name = pci_name(i7core_dev->pdev[0]); diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c index cb61a5b7d080..a2ca929e2168 100644 --- a/drivers/edac/i82443bxgx_edac.c +++ b/drivers/edac/i82443bxgx_edac.c @@ -31,8 +31,6 @@ #include #include "edac_module.h" -#define I82443_REVISION "0.1" - #define EDAC_MOD_STR "i82443bxgx_edac" /* The 82443BX supports SDRAM, or EDO (EDO for mobile only), "Memory @@ -320,7 +318,6 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) I82443BXGX_EAP_OFFSET_MBE)); mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82443_REVISION; mci->ctl_name = "I82443BXGX"; mci->dev_name = pci_name(pdev); mci->edac_check = i82443bxgx_edacmc_check; diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index 236c813227fc..3e3a80ffb322 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c @@ -16,7 +16,6 @@ #include #include "edac_module.h" -#define I82860_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "i82860_edac" #define i82860_printk(level, fmt, arg...) \ @@ -216,7 +215,6 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) /* I"m not sure about this but I think that all RDRAM is SECDED */ mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82860_REVISION; mci->ctl_name = i82860_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82860_check; diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index e286b7e74c7a..ceac925af38c 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c @@ -20,7 +20,6 @@ #include #include "edac_module.h" -#define I82875P_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "i82875p_edac" #define i82875p_printk(level, fmt, arg...) \ @@ -423,7 +422,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_UNKNOWN; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82875P_REVISION; mci->ctl_name = i82875p_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82875p_check; diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 9dcdab28f665..892815eaa97b 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c @@ -16,7 +16,6 @@ #include #include "edac_module.h" -#define I82975X_REVISION " Ver: 1.0.0" #define EDAC_MOD_STR "i82975x_edac" #define i82975x_printk(level, fmt, arg...) \ @@ -564,7 +563,6 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82975X_REVISION; mci->ctl_name = i82975x_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82975x_check; diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index 4260579e6901..aac9b9b360b8 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -45,7 +45,6 @@ #include #include "edac_module.h" -#define IE31200_REVISION "1.0" #define EDAC_MOD_STR "ie31200_edac" #define ie31200_printk(level, fmt, arg...) \ @@ -420,7 +419,6 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = IE31200_REVISION; mci->ctl_name = ie31200_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = ie31200_check; diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index d3650df94fe8..ec5d695bbb72 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -766,7 +766,6 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = MV64x60_REVISION; mci->ctl_name = mv64x60_ctl_name; if (edac_op_state == EDAC_OPSTATE_POLL) diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index e55e92590106..98d6dc7ef8e8 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c @@ -1063,7 +1063,6 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci, /* Initialize strings */ mci->mod_name = PPC4XX_EDAC_MODULE_NAME; - mci->mod_ver = PPC4XX_EDAC_MODULE_REVISION; mci->ctl_name = ppc4xx_edac_match->compatible, mci->dev_name = np->full_name; diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index 978916625ced..851e53e122aa 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c @@ -22,7 +22,6 @@ #include #include "edac_module.h" -#define R82600_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "r82600_edac" #define r82600_printk(level, fmt, arg...) \ @@ -316,7 +315,6 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = R82600_REVISION; mci->ctl_name = "R82600"; mci->dev_name = pci_name(pdev); mci->edac_check = r82600_check; diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 80d860cb0746..687d0f23b9cc 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -3125,7 +3125,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "sb_edac.c"; - mci->mod_ver = SBRIDGE_REVISION; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c index 64bef6c9cfb4..16dea97568a1 100644 --- a/drivers/edac/skx_edac.c +++ b/drivers/edac/skx_edac.c @@ -31,8 +31,6 @@ #include "edac_module.h" -#define SKX_REVISION " Ver: 1.0 " - /* * Debug macros */ @@ -473,7 +471,6 @@ static int skx_register_mci(struct skx_imc *imc) mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "skx_edac.c"; mci->dev_name = pci_name(imc->chan[0].cdev); - mci->mod_ver = SKX_REVISION; mci->ctl_page_to_phys = NULL; rc = skx_get_dimm_config(mci); diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 1c01dec78ec3..0c9c59e2b5a3 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -413,7 +413,6 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, mci->ctl_name = "synps_ddr_controller"; mci->dev_name = SYNPS_EDAC_MOD_STRING; mci->mod_name = SYNPS_EDAC_MOD_VER; - mci->mod_ver = "1"; edac_op_state = EDAC_OPSTATE_POLL; mci->edac_check = synps_edac_check; diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index 2d352b40ae1c..c8e8b9fd4772 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -732,7 +732,6 @@ static int thunderx_lmc_probe(struct pci_dev *pdev, mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = "thunderx-lmc"; - mci->mod_ver = "1"; mci->ctl_name = "thunderx-lmc"; mci->dev_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_NONE; diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c index 03c97a4bf590..cc779f3f9e2d 100644 --- a/drivers/edac/x38_edac.c +++ b/drivers/edac/x38_edac.c @@ -18,8 +18,6 @@ #include #include "edac_module.h" -#define X38_REVISION "1.1" - #define EDAC_MOD_STR "x38_edac" #define PCI_DEVICE_ID_INTEL_X38_HB 0x29e0 @@ -357,7 +355,6 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = X38_REVISION; mci->ctl_name = x38_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = x38_check; diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c index 669246056812..e8b81d7ef61f 100644 --- a/drivers/edac/xgene_edac.c +++ b/drivers/edac/xgene_edac.c @@ -415,7 +415,6 @@ static int xgene_edac_mc_add(struct xgene_edac *edac, struct device_node *np) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = "0.1"; mci->ctl_page_to_phys = NULL; mci->scrub_cap = SCRUB_FLAG_HW_SRC; mci->scrub_mode = SCRUB_HW_SRC; diff --git a/include/linux/edac.h b/include/linux/edac.h index 8ae0f45fafd6..cd75c173fd00 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -619,7 +619,6 @@ struct mem_ctl_info { */ struct device *pdev; const char *mod_name; - const char *mod_ver; const char *ctl_name; const char *dev_name; void *pvt_info; -- 2.13.0 -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: EDAC: Get rid of mci->mod_ver From: Borislav Petkov Message-Id: <20170629100311.vmdq6fojpo5ye4ne@pd.tnic> Date: Thu, 29 Jun 2017 12:03:11 +0200 To: linux-edac Cc: Thor Thayer , Mark Gross , Robert Richter , Tim Small , Ranganathan Desikan , "Arvind R." , Jason Baron , Tony Luck , Michal Simek , =?utf-8?B?U8O2cmVu?= Brinkmann , Ralf Baechle , David Daney , Loc Ho , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org List-ID: SGksCgphbnkgb2JqZWN0aW9ucz8KLS0tCkl0IGlzIGEgd3JpdGUtb25seSB2YXJpYWJsZSBzbyBn ZXQgcmlkIG9mIGl0LgoKU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRl PgpDYzogVGhvciBUaGF5ZXIgPHRob3IudGhheWVyQGxpbnV4LmludGVsLmNvbT4KQ2M6IE1hcmsg R3Jvc3MgPG1hcmsuZ3Jvc3NAaW50ZWwuY29tPgpDYzogUm9iZXJ0IFJpY2h0ZXIgPHJyaWNAa2Vy bmVsLm9yZz4KQ2M6IFRpbSBTbWFsbCA8dGltQGJ1dHRlcnNpZGV1cC5jb20+CkNjOiBSYW5nYW5h dGhhbiBEZXNpa2FuIDxyYXZpQGpldHp0ZWNobm9sb2dpZXMuY29tPgpDYzogIkFydmluZCBSLiIg PGFydmlubzU1QGdtYWlsLmNvbT4KQ2M6IEphc29uIEJhcm9uIDxqYmFyb25AYWthbWFpLmNvbT4K Q2M6IFRvbnkgTHVjayA8dG9ueS5sdWNrQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBTaW1layA8bWlj aGFsLnNpbWVrQHhpbGlueC5jb20+CkNjOiAiU8O2cmVuIEJyaW5rbWFubiIgPHNvcmVuLmJyaW5r bWFubkB4aWxpbnguY29tPgpDYzogUmFsZiBCYWVjaGxlIDxyYWxmQGxpbnV4LW1pcHMub3JnPgpD YzogRGF2aWQgRGFuZXkgPGRhdmlkLmRhbmV5QGNhdml1bS5jb20+CkNjOiBMb2MgSG8gPGxob0Bh cG0uY29tPgpDYzogbGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LWtlcm5lbEB2 Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpD YzogbGludXgtbWlwc0BsaW51eC1taXBzLm9yZwotLS0KIGRyaXZlcnMvZWRhYy9hbHRlcmFfZWRh Yy5jICAgICAgfCAyIC0tCiBkcml2ZXJzL2VkYWMvYW1kNjRfZWRhYy5jICAgICAgIHwgMSAtCiBk cml2ZXJzL2VkYWMvYW1kNzZ4X2VkYWMuYyAgICAgIHwgMiAtLQogZHJpdmVycy9lZGFjL2NwYzky NV9lZGFjLmMgICAgICB8IDEgLQogZHJpdmVycy9lZGFjL2U3NTJ4X2VkYWMuYyAgICAgICB8IDIg LS0KIGRyaXZlcnMvZWRhYy9lN3h4eF9lZGFjLmMgICAgICAgfCAyIC0tCiBkcml2ZXJzL2VkYWMv Z2hlc19lZGFjLmMgICAgICAgIHwgMyAtLS0KIGRyaXZlcnMvZWRhYy9oaWdoYmFua19tY19lZGFj LmMgfCAxIC0KIGRyaXZlcnMvZWRhYy9pMzAwMF9lZGFjLmMgICAgICAgfCAzIC0tLQogZHJpdmVy cy9lZGFjL2kzMjAwX2VkYWMuYyAgICAgICB8IDMgLS0tCiBkcml2ZXJzL2VkYWMvaTUwMDBfZWRh Yy5jICAgICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMvaTUxMDBfZWRhYy5jICAgICAgIHwgMSAtCiBk cml2ZXJzL2VkYWMvaTU0MDBfZWRhYy5jICAgICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMvaTczMDBf ZWRhYy5jICAgICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMvaTdjb3JlX2VkYWMuYyAgICAgIHwgMSAt CiBkcml2ZXJzL2VkYWMvaTgyNDQzYnhneF9lZGFjLmMgIHwgMyAtLS0KIGRyaXZlcnMvZWRhYy9p ODI4NjBfZWRhYy5jICAgICAgfCAyIC0tCiBkcml2ZXJzL2VkYWMvaTgyODc1cF9lZGFjLmMgICAg IHwgMiAtLQogZHJpdmVycy9lZGFjL2k4Mjk3NXhfZWRhYy5jICAgICB8IDIgLS0KIGRyaXZlcnMv ZWRhYy9pZTMxMjAwX2VkYWMuYyAgICAgfCAyIC0tCiBkcml2ZXJzL2VkYWMvbXY2NHg2MF9lZGFj LmMgICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMvcHBjNHh4X2VkYWMuYyAgICAgIHwgMSAtCiBkcml2 ZXJzL2VkYWMvcjgyNjAwX2VkYWMuYyAgICAgIHwgMiAtLQogZHJpdmVycy9lZGFjL3NiX2VkYWMu YyAgICAgICAgICB8IDEgLQogZHJpdmVycy9lZGFjL3NreF9lZGFjLmMgICAgICAgICB8IDMgLS0t CiBkcml2ZXJzL2VkYWMvc3lub3BzeXNfZWRhYy5jICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMvdGh1 bmRlcnhfZWRhYy5jICAgIHwgMSAtCiBkcml2ZXJzL2VkYWMveDM4X2VkYWMuYyAgICAgICAgIHwg MyAtLS0KIGRyaXZlcnMvZWRhYy94Z2VuZV9lZGFjLmMgICAgICAgfCAxIC0KIGluY2x1ZGUvbGlu dXgvZWRhYy5oICAgICAgICAgICAgfCAxIC0KIDMwIGZpbGVzIGNoYW5nZWQsIDUxIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5jIGIvZHJpdmVycy9l ZGFjL2FsdGVyYV9lZGFjLmMKaW5kZXggZGI3NWQ0YjYxNGY3Li5mYTJlNWRiNTZkMjQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZWRhYy9hbHRlcmFfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9hbHRl cmFfZWRhYy5jCkBAIC0zOCw3ICszOCw2IEBACiAjaW5jbHVkZSAiZWRhY19tb2R1bGUuaCIKIAog I2RlZmluZSBFREFDX01PRF9TVFIJCSJhbHRlcmFfZWRhYyIKLSNkZWZpbmUgRURBQ19WRVJTSU9O CQkiMSIKICNkZWZpbmUgRURBQ19ERVZJQ0UJCSJBbHRlcmEiCiAKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgYWx0cl9zZHJhbV9wcnZfZGF0YSBjNV9kYXRhID0gewpAQCAtMzkyLDcgKzM5MSw2IEBAIHN0 YXRpYyBpbnQgYWx0cl9zZHJhbV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQog CW1jaS0+ZWRhY19jdGxfY2FwID0gRURBQ19GTEFHX05PTkUgfCBFREFDX0ZMQUdfU0VDREVEOwog CW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+bW9kX25hbWUgPSBFREFD X01PRF9TVFI7Ci0JbWNpLT5tb2RfdmVyID0gRURBQ19WRVJTSU9OOwogCW1jaS0+Y3RsX25hbWUg PSBkZXZfbmFtZSgmcGRldi0+ZGV2KTsKIAltY2ktPnNjcnViX21vZGUgPSBTQ1JVQl9TV19TUkM7 CiAJbWNpLT5kZXZfbmFtZSA9IGRldl9uYW1lKCZwZGV2LT5kZXYpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9lZGFjL2FtZDY0X2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9hbWQ2NF9lZGFjLmMKaW5kZXgg M2FlYTU1Njk4MTY1Li5hYzJmMzAyOTVlZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9hbWQ2 NF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2FtZDY0X2VkYWMuYwpAQCAtMzEzMCw3ICszMTMw LDYgQEAgc3RhdGljIHZvaWQgc2V0dXBfbWNpX21pc2NfYXR0cnMoc3RydWN0IG1lbV9jdGxfaW5m byAqbWNpLAogCiAJbWNpLT5lZGFjX2NhcAkJPSBkZXRlcm1pbmVfZWRhY19jYXAocHZ0KTsKIAlt Y2ktPm1vZF9uYW1lCQk9IEVEQUNfTU9EX1NUUjsKLQltY2ktPm1vZF92ZXIJCT0gRURBQ19BTUQ2 NF9WRVJTSU9OOwogCW1jaS0+Y3RsX25hbWUJCT0gZmFtLT5jdGxfbmFtZTsKIAltY2ktPmRldl9u YW1lCQk9IHBjaV9uYW1lKHB2dC0+RjMpOwogCW1jaS0+Y3RsX3BhZ2VfdG9fcGh5cwk9IE5VTEw7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvYW1kNzZ4X2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9h bWQ3NnhfZWRhYy5jCmluZGV4IGE3NDUwMjc1YWQyOC4uOWM2ZTMyNmI0YzE0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2VkYWMvYW1kNzZ4X2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvYW1kNzZ4X2Vk YWMuYwpAQCAtMTksNyArMTksNiBAQAogI2luY2x1ZGUgPGxpbnV4L2VkYWMuaD4KICNpbmNsdWRl ICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lIEFNRDc2WF9SRVZJU0lPTgkiIFZlcjogMi4wLjIi CiAjZGVmaW5lIEVEQUNfTU9EX1NUUgkiYW1kNzZ4X2VkYWMiCiAKICNkZWZpbmUgYW1kNzZ4X3By aW50ayhsZXZlbCwgZm10LCBhcmcuLi4pIFwKQEAgLTI2Myw3ICsyNjIsNiBAQCBzdGF0aWMgaW50 IGFtZDc2eF9wcm9iZTEoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCW1jaS0+ ZWRhY19jYXAgPSBlbXNfbW9kZSA/CiAJCShFREFDX0ZMQUdfRUMgfCBFREFDX0ZMQUdfU0VDREVE KSA6IEVEQUNfRkxBR19OT05FOwogCW1jaS0+bW9kX25hbWUgPSBFREFDX01PRF9TVFI7Ci0JbWNp LT5tb2RfdmVyID0gQU1ENzZYX1JFVklTSU9OOwogCW1jaS0+Y3RsX25hbWUgPSBhbWQ3NnhfZGV2 c1tkZXZfaWR4XS5jdGxfbmFtZTsKIAltY2ktPmRldl9uYW1lID0gcGNpX25hbWUocGRldik7CiAJ bWNpLT5lZGFjX2NoZWNrID0gYW1kNzZ4X2NoZWNrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFj L2NwYzkyNV9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvY3BjOTI1X2VkYWMuYwppbmRleCA4MzdiNjJj NDk5M2QuLmNiYThlZTE0YTA2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2NwYzkyNV9lZGFj LmMKKysrIGIvZHJpdmVycy9lZGFjL2NwYzkyNV9lZGFjLmMKQEAgLTk5OSw3ICs5OTksNiBAQCBz dGF0aWMgaW50IGNwYzkyNV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCW1j aS0+ZWRhY19jdGxfY2FwID0gRURBQ19GTEFHX05PTkUgfCBFREFDX0ZMQUdfU0VDREVEOwogCW1j aS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+bW9kX25hbWUgPSBDUEM5MjVf RURBQ19NT0RfU1RSOwotCW1jaS0+bW9kX3ZlciA9IENQQzkyNV9FREFDX1JFVklTSU9OOwogCW1j aS0+Y3RsX25hbWUgPSBwZGV2LT5uYW1lOwogCiAJaWYgKGVkYWNfb3Bfc3RhdGUgPT0gRURBQ19P UFNUQVRFX1BPTEwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvZTc1MnhfZWRhYy5jIGIvZHJp dmVycy9lZGFjL2U3NTJ4X2VkYWMuYwppbmRleCAxYTM1MmNhZTFmNTIuLmI1ZGU5YTEzZWEzZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2U3NTJ4X2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMv ZTc1MnhfZWRhYy5jCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSA8bGludXgvZWRhYy5oPgog I2luY2x1ZGUgImVkYWNfbW9kdWxlLmgiCiAKLSNkZWZpbmUgRTc1MlhfUkVWSVNJT04JIiBWZXI6 IDIuMC4yIgogI2RlZmluZSBFREFDX01PRF9TVFIJImU3NTJ4X2VkYWMiCiAKIHN0YXRpYyBpbnQg cmVwb3J0X25vbl9tZW1vcnlfZXJyb3JzOwpAQCAtMTMwMyw3ICsxMzAyLDYgQEAgc3RhdGljIGlu dCBlNzUyeF9wcm9iZTEoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCQkoRURB Q19GTEFHX05PTkUgfCBFREFDX0ZMQUdfU0VDREVEIHwgRURBQ19GTEFHX1M0RUNENEVEKTsKIAkv KiBGSVhNRSAtIHdoYXQgaWYgZGlmZmVyZW50IG1lbW9yeSB0eXBlcyBhcmUgaW4gZGlmZmVyZW50 IGNzcm93cz8gKi8KIAltY2ktPm1vZF9uYW1lID0gRURBQ19NT0RfU1RSOwotCW1jaS0+bW9kX3Zl ciA9IEU3NTJYX1JFVklTSU9OOwogCW1jaS0+cGRldiA9ICZwZGV2LT5kZXY7CiAKIAllZGFjX2Ri ZygzLCAiaW5pdCBwdnRcbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL2U3eHh4X2VkYWMu YyBiL2RyaXZlcnMvZWRhYy9lN3h4eF9lZGFjLmMKaW5kZXggNjdlZjA3YWVkOTIzLi43NWQ3Y2U2 MmIzYmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9lN3h4eF9lZGFjLmMKKysrIGIvZHJpdmVy cy9lZGFjL2U3eHh4X2VkYWMuYwpAQCAtMzIsNyArMzIsNiBAQAogI2luY2x1ZGUgPGxpbnV4L2Vk YWMuaD4KICNpbmNsdWRlICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lCUU3WFhYX1JFVklTSU9O ICIgVmVyOiAyLjAuMiIKICNkZWZpbmUJRURBQ19NT0RfU1RSCSJlN3h4eF9lZGFjIgogCiAjZGVm aW5lIGU3eHh4X3ByaW50ayhsZXZlbCwgZm10LCBhcmcuLi4pIFwKQEAgLTQ1OCw3ICs0NTcsNiBA QCBzdGF0aWMgaW50IGU3eHh4X3Byb2JlMShzdHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50IGRldl9p ZHgpCiAJCUVEQUNfRkxBR19TNEVDRDRFRDsKIAkvKiBGSVhNRSAtIHdoYXQgaWYgZGlmZmVyZW50 IG1lbW9yeSB0eXBlcyBhcmUgaW4gZGlmZmVyZW50IGNzcm93cz8gKi8KIAltY2ktPm1vZF9uYW1l ID0gRURBQ19NT0RfU1RSOwotCW1jaS0+bW9kX3ZlciA9IEU3WFhYX1JFVklTSU9OOwogCW1jaS0+ cGRldiA9ICZwZGV2LT5kZXY7CiAJZWRhY19kYmcoMywgImluaXQgcHZ0XG4iKTsKIAlwdnQgPSAo c3RydWN0IGU3eHh4X3B2dCAqKW1jaS0+cHZ0X2luZm87CmRpZmYgLS1naXQgYS9kcml2ZXJzL2Vk YWMvZ2hlc19lZGFjLmMgYi9kcml2ZXJzL2VkYWMvZ2hlc19lZGFjLmMKaW5kZXggNGU2MWE2MjI5 ZGQyLi42ZjgwZWI2NWMyNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9naGVzX2VkYWMuYwor KysgYi9kcml2ZXJzL2VkYWMvZ2hlc19lZGFjLmMKQEAgLTE3LDggKzE3LDYgQEAKICNpbmNsdWRl ICJlZGFjX21vZHVsZS5oIgogI2luY2x1ZGUgPHJhcy9yYXNfZXZlbnQuaD4KIAotI2RlZmluZSBH SEVTX0VEQUNfUkVWSVNJT04gIiBWZXI6IDEuMC4wIgotCiBzdHJ1Y3QgZ2hlc19lZGFjX3B2dCB7 CiAJc3RydWN0IGxpc3RfaGVhZCBsaXN0OwogCXN0cnVjdCBnaGVzICpnaGVzOwpAQCAtNDUxLDcg KzQ0OSw2IEBAIGludCBnaGVzX2VkYWNfcmVnaXN0ZXIoc3RydWN0IGdoZXMgKmdoZXMsIHN0cnVj dCBkZXZpY2UgKmRldikKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVEQUNfRkxBR19OT05FOwogCW1j aS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfTk9ORTsKIAltY2ktPm1vZF9uYW1lID0gImdoZXNfZWRh Yy5jIjsKLQltY2ktPm1vZF92ZXIgPSBHSEVTX0VEQUNfUkVWSVNJT047CiAJbWNpLT5jdGxfbmFt ZSA9ICJnaGVzX2VkYWMiOwogCW1jaS0+ZGV2X25hbWUgPSAiZ2hlcyI7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZWRhYy9oaWdoYmFua19tY19lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaGlnaGJhbmtf bWNfZWRhYy5jCmluZGV4IDBlN2UwYTQwNGQ4OS4uNjA5MmU2MWJlNjA1IDEwMDY0NAotLS0gYS9k cml2ZXJzL2VkYWMvaGlnaGJhbmtfbWNfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9oaWdoYmFu a19tY19lZGFjLmMKQEAgLTIyNCw3ICsyMjQsNiBAQCBzdGF0aWMgaW50IGhpZ2hiYW5rX21jX3By b2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJbWNpLT5lZGFjX2N0bF9jYXAgPSBF REFDX0ZMQUdfTk9ORSB8IEVEQUNfRkxBR19TRUNERUQ7CiAJbWNpLT5lZGFjX2NhcCA9IEVEQUNf RkxBR19TRUNERUQ7CiAJbWNpLT5tb2RfbmFtZSA9IHBkZXYtPmRldi5kcml2ZXItPm5hbWU7Ci0J bWNpLT5tb2RfdmVyID0gIjEiOwogCW1jaS0+Y3RsX25hbWUgPSBpZC0+Y29tcGF0aWJsZTsKIAlt Y2ktPmRldl9uYW1lID0gZGV2X25hbWUoJnBkZXYtPmRldik7CiAJbWNpLT5zY3J1Yl9tb2RlID0g U0NSVUJfU1dfU1JDOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL2kzMDAwX2VkYWMuYyBiL2Ry aXZlcnMvZWRhYy9pMzAwMF9lZGFjLmMKaW5kZXggNTMwNjI0MDU3MGQ3Li44MDg1YTMyZWMzYmQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9pMzAwMF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFj L2kzMDAwX2VkYWMuYwpAQCAtMTYsOCArMTYsNiBAQAogI2luY2x1ZGUgPGxpbnV4L2VkYWMuaD4K ICNpbmNsdWRlICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lIEkzMDAwX1JFVklTSU9OCQkiMS4x IgotCiAjZGVmaW5lIEVEQUNfTU9EX1NUUgkJImkzMDAwX2VkYWMiCiAKICNkZWZpbmUgSTMwMDBf UkFOS1MJCTgKQEAgLTM3NSw3ICszNzMsNiBAQCBzdGF0aWMgaW50IGkzMDAwX3Byb2JlMShzdHJ1 Y3QgcGNpX2RldiAqcGRldiwgaW50IGRldl9pZHgpCiAJbWNpLT5lZGFjX2NhcCA9IEVEQUNfRkxB R19TRUNERUQ7CiAKIAltY2ktPm1vZF9uYW1lID0gRURBQ19NT0RfU1RSOwotCW1jaS0+bW9kX3Zl ciA9IEkzMDAwX1JFVklTSU9OOwogCW1jaS0+Y3RsX25hbWUgPSBpMzAwMF9kZXZzW2Rldl9pZHhd LmN0bF9uYW1lOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lfbmFtZShwZGV2KTsKIAltY2ktPmVkYWNf Y2hlY2sgPSBpMzAwMF9jaGVjazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy9pMzIwMF9lZGFj LmMgYi9kcml2ZXJzL2VkYWMvaTMyMDBfZWRhYy5jCmluZGV4IDc3YzU4ZDIwMWEzMC4uZDkyZDU2 Y2VlMTAxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMvaTMyMDBfZWRhYy5jCisrKyBiL2RyaXZl cnMvZWRhYy9pMzIwMF9lZGFjLmMKQEAgLTE3LDggKzE3LDYgQEAKIAogI2luY2x1ZGUgPGxpbnV4 L2lvLTY0LW5vbmF0b21pYy1sby1oaS5oPgogCi0jZGVmaW5lIEkzMjAwX1JFVklTSU9OICAgICAg ICAiMS4xIgotCiAjZGVmaW5lIEVEQUNfTU9EX1NUUiAgICAgICAgImkzMjAwX2VkYWMiCiAKICNk ZWZpbmUgUENJX0RFVklDRV9JRF9JTlRFTF8zMjAwX0hCICAgIDB4MjlmMApAQCAtMzc1LDcgKzM3 Myw2IEBAIHN0YXRpYyBpbnQgaTMyMDBfcHJvYmUxKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBpbnQg ZGV2X2lkeCkKIAltY2ktPmVkYWNfY2FwID0gRURBQ19GTEFHX1NFQ0RFRDsKIAogCW1jaS0+bW9k X25hbWUgPSBFREFDX01PRF9TVFI7Ci0JbWNpLT5tb2RfdmVyID0gSTMyMDBfUkVWSVNJT047CiAJ bWNpLT5jdGxfbmFtZSA9IGkzMjAwX2RldnNbZGV2X2lkeF0uY3RsX25hbWU7CiAJbWNpLT5kZXZf bmFtZSA9IHBjaV9uYW1lKHBkZXYpOwogCW1jaS0+ZWRhY19jaGVjayA9IGkzMjAwX2NoZWNrOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL2k1MDAwX2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9pNTAw MF9lZGFjLmMKaW5kZXggOGY1YTU2ZTI1YmQyLi41M2YyNGIxOGNkNjEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZWRhYy9pNTAwMF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2k1MDAwX2VkYWMuYwpA QCAtMTQzMCw3ICsxNDMwLDYgQEAgc3RhdGljIGludCBpNTAwMF9wcm9iZTEoc3RydWN0IHBjaV9k ZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCW1jaS0+ZWRhY19jdGxfY2FwID0gRURBQ19GTEFHX05P TkU7CiAJbWNpLT5lZGFjX2NhcCA9IEVEQUNfRkxBR19OT05FOwogCW1jaS0+bW9kX25hbWUgPSAi aTUwMDBfZWRhYy5jIjsKLQltY2ktPm1vZF92ZXIgPSBJNTAwMF9SRVZJU0lPTjsKIAltY2ktPmN0 bF9uYW1lID0gaTUwMDBfZGV2c1tkZXZfaWR4XS5jdGxfbmFtZTsKIAltY2ktPmRldl9uYW1lID0g cGNpX25hbWUocGRldik7CiAJbWNpLT5jdGxfcGFnZV90b19waHlzID0gTlVMTDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZWRhYy9pNTEwMF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaTUxMDBfZWRhYy5j CmluZGV4IGE4MzM0YzRhY2VhNy4uYjUwNmVlZjZiMTQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2Vk YWMvaTUxMDBfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pNTEwMF9lZGFjLmMKQEAgLTExMDgs NyArMTEwOCw2IEBAIHN0YXRpYyBpbnQgaTUxMDBfaW5pdF9vbmUoc3RydWN0IHBjaV9kZXYgKnBk ZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICppZCkKIAltY2ktPmVkYWNfY3RsX2NhcCA9 IEVEQUNfRkxBR19TRUNERUQ7CiAJbWNpLT5lZGFjX2NhcCA9IEVEQUNfRkxBR19TRUNERUQ7CiAJ bWNpLT5tb2RfbmFtZSA9ICJpNTEwMF9lZGFjLmMiOwotCW1jaS0+bW9kX3ZlciA9ICJub3QgdmVy c2lvbmVkIjsKIAltY2ktPmN0bF9uYW1lID0gImk1MTAwIjsKIAltY2ktPmRldl9uYW1lID0gcGNp X25hbWUocGRldik7CiAJbWNpLT5jdGxfcGFnZV90b19waHlzID0gTlVMTDsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZWRhYy9pNTQwMF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaTU0MDBfZWRhYy5jCmlu ZGV4IGNkODg5ZWRjODUxNi4uNmY4YmNkYjkyNTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMv aTU0MDBfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pNTQwMF9lZGFjLmMKQEAgLTEzMTUsNyAr MTMxNSw2IEBAIHN0YXRpYyBpbnQgaTU0MDBfcHJvYmUxKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBp bnQgZGV2X2lkeCkKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVEQUNfRkxBR19OT05FOwogCW1jaS0+ ZWRhY19jYXAgPSBFREFDX0ZMQUdfTk9ORTsKIAltY2ktPm1vZF9uYW1lID0gImk1NDAwX2VkYWMu YyI7Ci0JbWNpLT5tb2RfdmVyID0gSTU0MDBfUkVWSVNJT047CiAJbWNpLT5jdGxfbmFtZSA9IGk1 NDAwX2RldnNbZGV2X2lkeF0uY3RsX25hbWU7CiAJbWNpLT5kZXZfbmFtZSA9IHBjaV9uYW1lKHBk ZXYpOwogCW1jaS0+Y3RsX3BhZ2VfdG9fcGh5cyA9IE5VTEw7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2VkYWMvaTczMDBfZWRhYy5jIGIvZHJpdmVycy9lZGFjL2k3MzAwX2VkYWMuYwppbmRleCBlMzkx ZjVhNzE2YmUuLjZiNWE1NTRiYThlNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2k3MzAwX2Vk YWMuYworKysgYi9kcml2ZXJzL2VkYWMvaTczMDBfZWRhYy5jCkBAIC0xMDc3LDcgKzEwNzcsNiBA QCBzdGF0aWMgaW50IGk3MzAwX2luaXRfb25lKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBjb25zdCBz dHJ1Y3QgcGNpX2RldmljZV9pZCAqaWQpCiAJbWNpLT5lZGFjX2N0bF9jYXAgPSBFREFDX0ZMQUdf Tk9ORTsKIAltY2ktPmVkYWNfY2FwID0gRURBQ19GTEFHX05PTkU7CiAJbWNpLT5tb2RfbmFtZSA9 ICJpNzMwMF9lZGFjLmMiOwotCW1jaS0+bW9kX3ZlciA9IEk3MzAwX1JFVklTSU9OOwogCW1jaS0+ Y3RsX25hbWUgPSBpNzMwMF9kZXZzWzBdLmN0bF9uYW1lOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lf bmFtZShwZGV2KTsKIAltY2ktPmN0bF9wYWdlX3RvX3BoeXMgPSBOVUxMOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9lZGFjL2k3Y29yZV9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaTdjb3JlX2VkYWMuYwpp bmRleCA3NWFkODQ3NTkzYjcuLjk4OTk4ZWY1ODY0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFj L2k3Y29yZV9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2k3Y29yZV9lZGFjLmMKQEAgLTIxNTks NyArMjE1OSw2IEBAIHN0YXRpYyBpbnQgaTdjb3JlX3JlZ2lzdGVyX21jaShzdHJ1Y3QgaTdjb3Jl X2RldiAqaTdjb3JlX2RldikKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVEQUNfRkxBR19OT05FOwog CW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfTk9ORTsKIAltY2ktPm1vZF9uYW1lID0gImk3Y29y ZV9lZGFjLmMiOwotCW1jaS0+bW9kX3ZlciA9IEk3Q09SRV9SRVZJU0lPTjsKIAltY2ktPmN0bF9u YW1lID0ga2FzcHJpbnRmKEdGUF9LRVJORUwsICJpNyBjb3JlICMlZCIsCiAJCQkJICBpN2NvcmVf ZGV2LT5zb2NrZXQpOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lfbmFtZShpN2NvcmVfZGV2LT5wZGV2 WzBdKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy9pODI0NDNieGd4X2VkYWMuYyBiL2RyaXZl cnMvZWRhYy9pODI0NDNieGd4X2VkYWMuYwppbmRleCBjYjYxYTViN2QwODAuLmEyY2E5MjllMjE2 OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL2k4MjQ0M2J4Z3hfZWRhYy5jCisrKyBiL2RyaXZl cnMvZWRhYy9pODI0NDNieGd4X2VkYWMuYwpAQCAtMzEsOCArMzEsNiBAQAogI2luY2x1ZGUgPGxp bnV4L2VkYWMuaD4KICNpbmNsdWRlICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lIEk4MjQ0M19S RVZJU0lPTgkiMC4xIgotCiAjZGVmaW5lIEVEQUNfTU9EX1NUUiAgICAiaTgyNDQzYnhneF9lZGFj IgogCiAvKiBUaGUgODI0NDNCWCBzdXBwb3J0cyBTRFJBTSwgb3IgRURPIChFRE8gZm9yIG1vYmls ZSBvbmx5KSwgIk1lbW9yeQpAQCAtMzIwLDcgKzMxOCw2IEBAIHN0YXRpYyBpbnQgaTgyNDQzYnhn eF9lZGFjbWNfcHJvYmUxKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBpbnQgZGV2X2lkeCkKIAkJCQlJ ODI0NDNCWEdYX0VBUF9PRkZTRVRfTUJFKSk7CiAKIAltY2ktPm1vZF9uYW1lID0gRURBQ19NT0Rf U1RSOwotCW1jaS0+bW9kX3ZlciA9IEk4MjQ0M19SRVZJU0lPTjsKIAltY2ktPmN0bF9uYW1lID0g Ikk4MjQ0M0JYR1giOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lfbmFtZShwZGV2KTsKIAltY2ktPmVk YWNfY2hlY2sgPSBpODI0NDNieGd4X2VkYWNtY19jaGVjazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv ZWRhYy9pODI4NjBfZWRhYy5jIGIvZHJpdmVycy9lZGFjL2k4Mjg2MF9lZGFjLmMKaW5kZXggMjM2 YzgxMzIyN2ZjLi4zZTNhODBmZmIzMjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9pODI4NjBf ZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9pODI4NjBfZWRhYy5jCkBAIC0xNiw3ICsxNiw2IEBA CiAjaW5jbHVkZSA8bGludXgvZWRhYy5oPgogI2luY2x1ZGUgImVkYWNfbW9kdWxlLmgiCiAKLSNk ZWZpbmUgIEk4Mjg2MF9SRVZJU0lPTiAiIFZlcjogMi4wLjIiCiAjZGVmaW5lIEVEQUNfTU9EX1NU UgkiaTgyODYwX2VkYWMiCiAKICNkZWZpbmUgaTgyODYwX3ByaW50ayhsZXZlbCwgZm10LCBhcmcu Li4pIFwKQEAgLTIxNiw3ICsyMTUsNiBAQCBzdGF0aWMgaW50IGk4Mjg2MF9wcm9iZTEoc3RydWN0 IHBjaV9kZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCS8qIEkibSBub3Qgc3VyZSBhYm91dCB0aGlz IGJ1dCBJIHRoaW5rIHRoYXQgYWxsIFJEUkFNIGlzIFNFQ0RFRCAqLwogCW1jaS0+ZWRhY19jYXAg PSBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+bW9kX25hbWUgPSBFREFDX01PRF9TVFI7Ci0JbWNp LT5tb2RfdmVyID0gSTgyODYwX1JFVklTSU9OOwogCW1jaS0+Y3RsX25hbWUgPSBpODI4NjBfZGV2 c1tkZXZfaWR4XS5jdGxfbmFtZTsKIAltY2ktPmRldl9uYW1lID0gcGNpX25hbWUocGRldik7CiAJ bWNpLT5lZGFjX2NoZWNrID0gaTgyODYwX2NoZWNrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFj L2k4Mjg3NXBfZWRhYy5jIGIvZHJpdmVycy9lZGFjL2k4Mjg3NXBfZWRhYy5jCmluZGV4IGUyODZi N2U3NGM3YS4uY2VhYzkyNWFmMzhjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMvaTgyODc1cF9l ZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL2k4Mjg3NXBfZWRhYy5jCkBAIC0yMCw3ICsyMCw2IEBA CiAjaW5jbHVkZSA8bGludXgvZWRhYy5oPgogI2luY2x1ZGUgImVkYWNfbW9kdWxlLmgiCiAKLSNk ZWZpbmUgSTgyODc1UF9SRVZJU0lPTgkiIFZlcjogMi4wLjIiCiAjZGVmaW5lIEVEQUNfTU9EX1NU UgkJImk4Mjg3NXBfZWRhYyIKIAogI2RlZmluZSBpODI4NzVwX3ByaW50ayhsZXZlbCwgZm10LCBh cmcuLi4pIFwKQEAgLTQyMyw3ICs0MjIsNiBAQCBzdGF0aWMgaW50IGk4Mjg3NXBfcHJvYmUxKHN0 cnVjdCBwY2lfZGV2ICpwZGV2LCBpbnQgZGV2X2lkeCkKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVE QUNfRkxBR19OT05FIHwgRURBQ19GTEFHX1NFQ0RFRDsKIAltY2ktPmVkYWNfY2FwID0gRURBQ19G TEFHX1VOS05PV047CiAJbWNpLT5tb2RfbmFtZSA9IEVEQUNfTU9EX1NUUjsKLQltY2ktPm1vZF92 ZXIgPSBJODI4NzVQX1JFVklTSU9OOwogCW1jaS0+Y3RsX25hbWUgPSBpODI4NzVwX2RldnNbZGV2 X2lkeF0uY3RsX25hbWU7CiAJbWNpLT5kZXZfbmFtZSA9IHBjaV9uYW1lKHBkZXYpOwogCW1jaS0+ ZWRhY19jaGVjayA9IGk4Mjg3NXBfY2hlY2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvaTgy OTc1eF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaTgyOTc1eF9lZGFjLmMKaW5kZXggOWRjZGFiMjhm NjY1Li44OTI4MTVlYWE5N2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9pODI5NzV4X2VkYWMu YworKysgYi9kcml2ZXJzL2VkYWMvaTgyOTc1eF9lZGFjLmMKQEAgLTE2LDcgKzE2LDYgQEAKICNp bmNsdWRlIDxsaW51eC9lZGFjLmg+CiAjaW5jbHVkZSAiZWRhY19tb2R1bGUuaCIKIAotI2RlZmlu ZSBJODI5NzVYX1JFVklTSU9OCSIgVmVyOiAxLjAuMCIKICNkZWZpbmUgRURBQ19NT0RfU1RSCQki aTgyOTc1eF9lZGFjIgogCiAjZGVmaW5lIGk4Mjk3NXhfcHJpbnRrKGxldmVsLCBmbXQsIGFyZy4u LikgXApAQCAtNTY0LDcgKzU2Myw2IEBAIHN0YXRpYyBpbnQgaTgyOTc1eF9wcm9iZTEoc3RydWN0 IHBjaV9kZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCW1jaS0+ZWRhY19jdGxfY2FwID0gRURBQ19G TEFHX05PTkUgfCBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdf Tk9ORSB8IEVEQUNfRkxBR19TRUNERUQ7CiAJbWNpLT5tb2RfbmFtZSA9IEVEQUNfTU9EX1NUUjsK LQltY2ktPm1vZF92ZXIgPSBJODI5NzVYX1JFVklTSU9OOwogCW1jaS0+Y3RsX25hbWUgPSBpODI5 NzV4X2RldnNbZGV2X2lkeF0uY3RsX25hbWU7CiAJbWNpLT5kZXZfbmFtZSA9IHBjaV9uYW1lKHBk ZXYpOwogCW1jaS0+ZWRhY19jaGVjayA9IGk4Mjk3NXhfY2hlY2s7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2VkYWMvaWUzMTIwMF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvaWUzMTIwMF9lZGFjLmMKaW5k ZXggNDI2MDU3OWU2OTAxLi5hYWM5YjliMzYwYjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9p ZTMxMjAwX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvaWUzMTIwMF9lZGFjLmMKQEAgLTQ1LDcg KzQ1LDYgQEAKICNpbmNsdWRlIDxsaW51eC9pby02NC1ub25hdG9taWMtbG8taGkuaD4KICNpbmNs dWRlICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lIElFMzEyMDBfUkVWSVNJT04gIjEuMCIKICNk ZWZpbmUgRURBQ19NT0RfU1RSICJpZTMxMjAwX2VkYWMiCiAKICNkZWZpbmUgaWUzMTIwMF9wcmlu dGsobGV2ZWwsIGZtdCwgYXJnLi4uKSBcCkBAIC00MjAsNyArNDE5LDYgQEAgc3RhdGljIGludCBp ZTMxMjAwX3Byb2JlMShzdHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50IGRldl9pZHgpCiAJbWNpLT5l ZGFjX2N0bF9jYXAgPSBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZM QUdfU0VDREVEOwogCW1jaS0+bW9kX25hbWUgPSBFREFDX01PRF9TVFI7Ci0JbWNpLT5tb2RfdmVy ID0gSUUzMTIwMF9SRVZJU0lPTjsKIAltY2ktPmN0bF9uYW1lID0gaWUzMTIwMF9kZXZzW2Rldl9p ZHhdLmN0bF9uYW1lOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lfbmFtZShwZGV2KTsKIAltY2ktPmVk YWNfY2hlY2sgPSBpZTMxMjAwX2NoZWNrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL212NjR4 NjBfZWRhYy5jIGIvZHJpdmVycy9lZGFjL212NjR4NjBfZWRhYy5jCmluZGV4IGQzNjUwZGY5NGZl OC4uZWM1ZDY5NWJiYjcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMvbXY2NHg2MF9lZGFjLmMK KysrIGIvZHJpdmVycy9lZGFjL212NjR4NjBfZWRhYy5jCkBAIC03NjYsNyArNzY2LDYgQEAgc3Rh dGljIGludCBtdjY0eDYwX21jX2Vycl9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 KQogCW1jaS0+ZWRhY19jdGxfY2FwID0gRURBQ19GTEFHX05PTkUgfCBFREFDX0ZMQUdfU0VDREVE OwogCW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfU0VDREVEOwogCW1jaS0+bW9kX25hbWUgPSBF REFDX01PRF9TVFI7Ci0JbWNpLT5tb2RfdmVyID0gTVY2NHg2MF9SRVZJU0lPTjsKIAltY2ktPmN0 bF9uYW1lID0gbXY2NHg2MF9jdGxfbmFtZTsKIAogCWlmIChlZGFjX29wX3N0YXRlID09IEVEQUNf T1BTVEFURV9QT0xMKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL3BwYzR4eF9lZGFjLmMgYi9k cml2ZXJzL2VkYWMvcHBjNHh4X2VkYWMuYwppbmRleCBlNTVlOTI1OTAxMDYuLjk4ZDZkYzdlZjhl OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL3BwYzR4eF9lZGFjLmMKKysrIGIvZHJpdmVycy9l ZGFjL3BwYzR4eF9lZGFjLmMKQEAgLTEwNjMsNyArMTA2Myw2IEBAIHN0YXRpYyBpbnQgcHBjNHh4 X2VkYWNfbWNfaW5pdChzdHJ1Y3QgbWVtX2N0bF9pbmZvICptY2ksCiAJLyogSW5pdGlhbGl6ZSBz dHJpbmdzICovCiAKIAltY2ktPm1vZF9uYW1lCQk9IFBQQzRYWF9FREFDX01PRFVMRV9OQU1FOwot CW1jaS0+bW9kX3ZlcgkJPSBQUEM0WFhfRURBQ19NT0RVTEVfUkVWSVNJT047CiAJbWNpLT5jdGxf bmFtZQkJPSBwcGM0eHhfZWRhY19tYXRjaC0+Y29tcGF0aWJsZSwKIAltY2ktPmRldl9uYW1lCQk9 IG5wLT5mdWxsX25hbWU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy9yODI2MDBfZWRhYy5j IGIvZHJpdmVycy9lZGFjL3I4MjYwMF9lZGFjLmMKaW5kZXggOTc4OTE2NjI1Y2VkLi44NTFlNTNl MTIyYWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9yODI2MDBfZWRhYy5jCisrKyBiL2RyaXZl cnMvZWRhYy9yODI2MDBfZWRhYy5jCkBAIC0yMiw3ICsyMiw2IEBACiAjaW5jbHVkZSA8bGludXgv ZWRhYy5oPgogI2luY2x1ZGUgImVkYWNfbW9kdWxlLmgiCiAKLSNkZWZpbmUgUjgyNjAwX1JFVklT SU9OCSIgVmVyOiAyLjAuMiIKICNkZWZpbmUgRURBQ19NT0RfU1RSCSJyODI2MDBfZWRhYyIKIAog I2RlZmluZSByODI2MDBfcHJpbnRrKGxldmVsLCBmbXQsIGFyZy4uLikgXApAQCAtMzE2LDcgKzMx NSw2IEBAIHN0YXRpYyBpbnQgcjgyNjAwX3Byb2JlMShzdHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50 IGRldl9pZHgpCiAJCW1jaS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfTk9ORTsKIAogCW1jaS0+bW9k X25hbWUgPSBFREFDX01PRF9TVFI7Ci0JbWNpLT5tb2RfdmVyID0gUjgyNjAwX1JFVklTSU9OOwog CW1jaS0+Y3RsX25hbWUgPSAiUjgyNjAwIjsKIAltY2ktPmRldl9uYW1lID0gcGNpX25hbWUocGRl dik7CiAJbWNpLT5lZGFjX2NoZWNrID0gcjgyNjAwX2NoZWNrOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9lZGFjL3NiX2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9zYl9lZGFjLmMKaW5kZXggODBkODYwY2Iw NzQ2Li42ODdkMGYyM2I5Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZWRhYy9zYl9lZGFjLmMKKysr IGIvZHJpdmVycy9lZGFjL3NiX2VkYWMuYwpAQCAtMzEyNSw3ICszMTI1LDYgQEAgc3RhdGljIGlu dCBzYnJpZGdlX3JlZ2lzdGVyX21jaShzdHJ1Y3Qgc2JyaWRnZV9kZXYgKnNicmlkZ2VfZGV2LCBl bnVtIHR5cGUgdHlwZSkKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVEQUNfRkxBR19OT05FOwogCW1j aS0+ZWRhY19jYXAgPSBFREFDX0ZMQUdfTk9ORTsKIAltY2ktPm1vZF9uYW1lID0gInNiX2VkYWMu YyI7Ci0JbWNpLT5tb2RfdmVyID0gU0JSSURHRV9SRVZJU0lPTjsKIAltY2ktPmRldl9uYW1lID0g cGNpX25hbWUocGRldik7CiAJbWNpLT5jdGxfcGFnZV90b19waHlzID0gTlVMTDsKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9lZGFjL3NreF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMvc2t4X2VkYWMuYwpp bmRleCA2NGJlZjZjOWNmYjQuLjE2ZGVhOTc1NjhhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFj L3NreF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL3NreF9lZGFjLmMKQEAgLTMxLDggKzMxLDYg QEAKIAogI2luY2x1ZGUgImVkYWNfbW9kdWxlLmgiCiAKLSNkZWZpbmUgU0tYX1JFVklTSU9OICAg ICIgVmVyOiAxLjAgIgotCiAvKgogICogRGVidWcgbWFjcm9zCiAgKi8KQEAgLTQ3Myw3ICs0NzEs NiBAQCBzdGF0aWMgaW50IHNreF9yZWdpc3Rlcl9tY2koc3RydWN0IHNreF9pbWMgKmltYykKIAlt Y2ktPmVkYWNfY2FwID0gRURBQ19GTEFHX05PTkU7CiAJbWNpLT5tb2RfbmFtZSA9ICJza3hfZWRh Yy5jIjsKIAltY2ktPmRldl9uYW1lID0gcGNpX25hbWUoaW1jLT5jaGFuWzBdLmNkZXYpOwotCW1j aS0+bW9kX3ZlciA9IFNLWF9SRVZJU0lPTjsKIAltY2ktPmN0bF9wYWdlX3RvX3BoeXMgPSBOVUxM OwogCiAJcmMgPSBza3hfZ2V0X2RpbW1fY29uZmlnKG1jaSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2VkYWMvc3lub3BzeXNfZWRhYy5jIGIvZHJpdmVycy9lZGFjL3N5bm9wc3lzX2VkYWMuYwppbmRl eCAxYzAxZGVjNzhlYzMuLjBjOWM1OWUyYjVhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL3N5 bm9wc3lzX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvc3lub3BzeXNfZWRhYy5jCkBAIC00MTMs NyArNDEzLDYgQEAgc3RhdGljIGludCBzeW5wc19lZGFjX21jX2luaXQoc3RydWN0IG1lbV9jdGxf aW5mbyAqbWNpLAogCW1jaS0+Y3RsX25hbWUgPSAic3lucHNfZGRyX2NvbnRyb2xsZXIiOwogCW1j aS0+ZGV2X25hbWUgPSBTWU5QU19FREFDX01PRF9TVFJJTkc7CiAJbWNpLT5tb2RfbmFtZSA9IFNZ TlBTX0VEQUNfTU9EX1ZFUjsKLQltY2ktPm1vZF92ZXIgPSAiMSI7CiAKIAllZGFjX29wX3N0YXRl ID0gRURBQ19PUFNUQVRFX1BPTEw7CiAJbWNpLT5lZGFjX2NoZWNrID0gc3lucHNfZWRhY19jaGVj azsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRhYy90aHVuZGVyeF9lZGFjLmMgYi9kcml2ZXJzL2Vk YWMvdGh1bmRlcnhfZWRhYy5jCmluZGV4IDJkMzUyYjQwYWUxYy4uYzhlOGI5ZmQ0NzcyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2VkYWMvdGh1bmRlcnhfZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy90 aHVuZGVyeF9lZGFjLmMKQEAgLTczMiw3ICs3MzIsNiBAQCBzdGF0aWMgaW50IHRodW5kZXJ4X2xt Y19wcm9iZShzdHJ1Y3QgcGNpX2RldiAqcGRldiwKIAltY2ktPmVkYWNfY2FwID0gRURBQ19GTEFH X1NFQ0RFRDsKIAogCW1jaS0+bW9kX25hbWUgPSAidGh1bmRlcngtbG1jIjsKLQltY2ktPm1vZF92 ZXIgPSAiMSI7CiAJbWNpLT5jdGxfbmFtZSA9ICJ0aHVuZGVyeC1sbWMiOwogCW1jaS0+ZGV2X25h bWUgPSBkZXZfbmFtZSgmcGRldi0+ZGV2KTsKIAltY2ktPnNjcnViX21vZGUgPSBTQ1JVQl9OT05F OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9lZGFjL3gzOF9lZGFjLmMgYi9kcml2ZXJzL2VkYWMveDM4 X2VkYWMuYwppbmRleCAwM2M5N2E0YmY1OTAuLmNjNzc5ZjNmOWUyZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9lZGFjL3gzOF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL3gzOF9lZGFjLmMKQEAgLTE4 LDggKzE4LDYgQEAKICNpbmNsdWRlIDxsaW51eC9pby02NC1ub25hdG9taWMtbG8taGkuaD4KICNp bmNsdWRlICJlZGFjX21vZHVsZS5oIgogCi0jZGVmaW5lIFgzOF9SRVZJU0lPTgkJIjEuMSIKLQog I2RlZmluZSBFREFDX01PRF9TVFIJCSJ4MzhfZWRhYyIKIAogI2RlZmluZSBQQ0lfREVWSUNFX0lE X0lOVEVMX1gzOF9IQgkweDI5ZTAKQEAgLTM1Nyw3ICszNTUsNiBAQCBzdGF0aWMgaW50IHgzOF9w cm9iZTEoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGludCBkZXZfaWR4KQogCW1jaS0+ZWRhY19jYXAg PSBFREFDX0ZMQUdfU0VDREVEOwogCiAJbWNpLT5tb2RfbmFtZSA9IEVEQUNfTU9EX1NUUjsKLQlt Y2ktPm1vZF92ZXIgPSBYMzhfUkVWSVNJT047CiAJbWNpLT5jdGxfbmFtZSA9IHgzOF9kZXZzW2Rl dl9pZHhdLmN0bF9uYW1lOwogCW1jaS0+ZGV2X25hbWUgPSBwY2lfbmFtZShwZGV2KTsKIAltY2kt PmVkYWNfY2hlY2sgPSB4MzhfY2hlY2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMveGdlbmVf ZWRhYy5jIGIvZHJpdmVycy9lZGFjL3hnZW5lX2VkYWMuYwppbmRleCA2NjkyNDYwNTY4MTIuLmU4 YjgxZDdlZjYxZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL3hnZW5lX2VkYWMuYworKysgYi9k cml2ZXJzL2VkYWMveGdlbmVfZWRhYy5jCkBAIC00MTUsNyArNDE1LDYgQEAgc3RhdGljIGludCB4 Z2VuZV9lZGFjX21jX2FkZChzdHJ1Y3QgeGdlbmVfZWRhYyAqZWRhYywgc3RydWN0IGRldmljZV9u b2RlICpucCkKIAltY2ktPmVkYWNfY3RsX2NhcCA9IEVEQUNfRkxBR19TRUNERUQ7CiAJbWNpLT5l ZGFjX2NhcCA9IEVEQUNfRkxBR19TRUNERUQ7CiAJbWNpLT5tb2RfbmFtZSA9IEVEQUNfTU9EX1NU UjsKLQltY2ktPm1vZF92ZXIgPSAiMC4xIjsKIAltY2ktPmN0bF9wYWdlX3RvX3BoeXMgPSBOVUxM OwogCW1jaS0+c2NydWJfY2FwID0gU0NSVUJfRkxBR19IV19TUkM7CiAJbWNpLT5zY3J1Yl9tb2Rl ID0gU0NSVUJfSFdfU1JDOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9lZGFjLmggYi9pbmNs dWRlL2xpbnV4L2VkYWMuaAppbmRleCA4YWUwZjQ1ZmFmZDYuLmNkNzVjMTczZmQwMCAxMDA2NDQK LS0tIGEvaW5jbHVkZS9saW51eC9lZGFjLmgKKysrIGIvaW5jbHVkZS9saW51eC9lZGFjLmgKQEAg LTYxOSw3ICs2MTksNiBAQCBzdHJ1Y3QgbWVtX2N0bF9pbmZvIHsKIAkgKi8KIAlzdHJ1Y3QgZGV2 aWNlICpwZGV2OwogCWNvbnN0IGNoYXIgKm1vZF9uYW1lOwotCWNvbnN0IGNoYXIgKm1vZF92ZXI7 CiAJY29uc3QgY2hhciAqY3RsX25hbWU7CiAJY29uc3QgY2hhciAqZGV2X25hbWU7CiAJdm9pZCAq cHZ0X2luZm87Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: bp@alien8.de (Borislav Petkov) Date: Thu, 29 Jun 2017 12:03:11 +0200 Subject: [PATCH] EDAC: Get rid of mci->mod_ver Message-ID: <20170629100311.vmdq6fojpo5ye4ne@pd.tnic> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, any objections? --- It is a write-only variable so get rid of it. Signed-off-by: Borislav Petkov Cc: Thor Thayer Cc: Mark Gross Cc: Robert Richter Cc: Tim Small Cc: Ranganathan Desikan Cc: "Arvind R." Cc: Jason Baron Cc: Tony Luck Cc: Michal Simek Cc: "S?ren Brinkmann" Cc: Ralf Baechle Cc: David Daney Cc: Loc Ho Cc: linux-edac at vger.kernel.org Cc: linux-kernel at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-mips at linux-mips.org --- drivers/edac/altera_edac.c | 2 -- drivers/edac/amd64_edac.c | 1 - drivers/edac/amd76x_edac.c | 2 -- drivers/edac/cpc925_edac.c | 1 - drivers/edac/e752x_edac.c | 2 -- drivers/edac/e7xxx_edac.c | 2 -- drivers/edac/ghes_edac.c | 3 --- drivers/edac/highbank_mc_edac.c | 1 - drivers/edac/i3000_edac.c | 3 --- drivers/edac/i3200_edac.c | 3 --- drivers/edac/i5000_edac.c | 1 - drivers/edac/i5100_edac.c | 1 - drivers/edac/i5400_edac.c | 1 - drivers/edac/i7300_edac.c | 1 - drivers/edac/i7core_edac.c | 1 - drivers/edac/i82443bxgx_edac.c | 3 --- drivers/edac/i82860_edac.c | 2 -- drivers/edac/i82875p_edac.c | 2 -- drivers/edac/i82975x_edac.c | 2 -- drivers/edac/ie31200_edac.c | 2 -- drivers/edac/mv64x60_edac.c | 1 - drivers/edac/ppc4xx_edac.c | 1 - drivers/edac/r82600_edac.c | 2 -- drivers/edac/sb_edac.c | 1 - drivers/edac/skx_edac.c | 3 --- drivers/edac/synopsys_edac.c | 1 - drivers/edac/thunderx_edac.c | 1 - drivers/edac/x38_edac.c | 3 --- drivers/edac/xgene_edac.c | 1 - include/linux/edac.h | 1 - 30 files changed, 51 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index db75d4b614f7..fa2e5db56d24 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -38,7 +38,6 @@ #include "edac_module.h" #define EDAC_MOD_STR "altera_edac" -#define EDAC_VERSION "1" #define EDAC_DEVICE "Altera" static const struct altr_sdram_prv_data c5_data = { @@ -392,7 +391,6 @@ static int altr_sdram_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = EDAC_VERSION; mci->ctl_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_SW_SRC; mci->dev_name = dev_name(&pdev->dev); diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 3aea55698165..ac2f30295efe 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3130,7 +3130,6 @@ static void setup_mci_misc_attrs(struct mem_ctl_info *mci, mci->edac_cap = determine_edac_cap(pvt); mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = EDAC_AMD64_VERSION; mci->ctl_name = fam->ctl_name; mci->dev_name = pci_name(pvt->F3); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index a7450275ad28..9c6e326b4c14 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c @@ -19,7 +19,6 @@ #include #include "edac_module.h" -#define AMD76X_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "amd76x_edac" #define amd76x_printk(level, fmt, arg...) \ @@ -263,7 +262,6 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = ems_mode ? (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; mci->dev_name = pci_name(pdev); mci->edac_check = amd76x_check; diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c index 837b62c4993d..cba8ee14a067 100644 --- a/drivers/edac/cpc925_edac.c +++ b/drivers/edac/cpc925_edac.c @@ -999,7 +999,6 @@ static int cpc925_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = CPC925_EDAC_MOD_STR; - mci->mod_ver = CPC925_EDAC_REVISION; mci->ctl_name = pdev->name; if (edac_op_state == EDAC_OPSTATE_POLL) diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 1a352cae1f52..b5de9a13ea3f 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c @@ -26,7 +26,6 @@ #include #include "edac_module.h" -#define E752X_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "e752x_edac" static int report_non_memory_errors; @@ -1303,7 +1302,6 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) (EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED); /* FIXME - what if different memory types are in different csrows? */ mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = E752X_REVISION; mci->pdev = &pdev->dev; edac_dbg(3, "init pvt\n"); diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 67ef07aed923..75d7ce62b3be 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c @@ -32,7 +32,6 @@ #include #include "edac_module.h" -#define E7XXX_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "e7xxx_edac" #define e7xxx_printk(level, fmt, arg...) \ @@ -458,7 +457,6 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) EDAC_FLAG_S4ECD4ED; /* FIXME - what if different memory types are in different csrows? */ mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = E7XXX_REVISION; mci->pdev = &pdev->dev; edac_dbg(3, "init pvt\n"); pvt = (struct e7xxx_pvt *)mci->pvt_info; diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 4e61a6229dd2..6f80eb65c26c 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -17,8 +17,6 @@ #include "edac_module.h" #include -#define GHES_EDAC_REVISION " Ver: 1.0.0" - struct ghes_edac_pvt { struct list_head list; struct ghes *ghes; @@ -451,7 +449,6 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "ghes_edac.c"; - mci->mod_ver = GHES_EDAC_REVISION; mci->ctl_name = "ghes_edac"; mci->dev_name = "ghes"; diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c index 0e7e0a404d89..6092e61be605 100644 --- a/drivers/edac/highbank_mc_edac.c +++ b/drivers/edac/highbank_mc_edac.c @@ -224,7 +224,6 @@ static int highbank_mc_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = pdev->dev.driver->name; - mci->mod_ver = "1"; mci->ctl_name = id->compatible; mci->dev_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_SW_SRC; diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c index 5306240570d7..8085a32ec3bd 100644 --- a/drivers/edac/i3000_edac.c +++ b/drivers/edac/i3000_edac.c @@ -16,8 +16,6 @@ #include #include "edac_module.h" -#define I3000_REVISION "1.1" - #define EDAC_MOD_STR "i3000_edac" #define I3000_RANKS 8 @@ -375,7 +373,6 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I3000_REVISION; mci->ctl_name = i3000_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i3000_check; diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index 77c58d201a30..d92d56cee101 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c @@ -17,8 +17,6 @@ #include -#define I3200_REVISION "1.1" - #define EDAC_MOD_STR "i3200_edac" #define PCI_DEVICE_ID_INTEL_3200_HB 0x29f0 @@ -375,7 +373,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I3200_REVISION; mci->ctl_name = i3200_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i3200_check; diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 8f5a56e25bd2..53f24b18cd61 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -1430,7 +1430,6 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i5000_edac.c"; - mci->mod_ver = I5000_REVISION; mci->ctl_name = i5000_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c index a8334c4acea7..b506eef6b146 100644 --- a/drivers/edac/i5100_edac.c +++ b/drivers/edac/i5100_edac.c @@ -1108,7 +1108,6 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = "i5100_edac.c"; - mci->mod_ver = "not versioned"; mci->ctl_name = "i5100"; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c index cd889edc8516..6f8bcdb9256a 100644 --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c @@ -1315,7 +1315,6 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i5400_edac.c"; - mci->mod_ver = I5400_REVISION; mci->ctl_name = i5400_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index e391f5a716be..6b5a554ba8e4 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -1077,7 +1077,6 @@ static int i7300_init_one(struct pci_dev *pdev, const struct pci_device_id *id) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i7300_edac.c"; - mci->mod_ver = I7300_REVISION; mci->ctl_name = i7300_devs[0].ctl_name; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 75ad847593b7..98998ef58647 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -2159,7 +2159,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "i7core_edac.c"; - mci->mod_ver = I7CORE_REVISION; mci->ctl_name = kasprintf(GFP_KERNEL, "i7 core #%d", i7core_dev->socket); mci->dev_name = pci_name(i7core_dev->pdev[0]); diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c index cb61a5b7d080..a2ca929e2168 100644 --- a/drivers/edac/i82443bxgx_edac.c +++ b/drivers/edac/i82443bxgx_edac.c @@ -31,8 +31,6 @@ #include #include "edac_module.h" -#define I82443_REVISION "0.1" - #define EDAC_MOD_STR "i82443bxgx_edac" /* The 82443BX supports SDRAM, or EDO (EDO for mobile only), "Memory @@ -320,7 +318,6 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) I82443BXGX_EAP_OFFSET_MBE)); mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82443_REVISION; mci->ctl_name = "I82443BXGX"; mci->dev_name = pci_name(pdev); mci->edac_check = i82443bxgx_edacmc_check; diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index 236c813227fc..3e3a80ffb322 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c @@ -16,7 +16,6 @@ #include #include "edac_module.h" -#define I82860_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "i82860_edac" #define i82860_printk(level, fmt, arg...) \ @@ -216,7 +215,6 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) /* I"m not sure about this but I think that all RDRAM is SECDED */ mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82860_REVISION; mci->ctl_name = i82860_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82860_check; diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index e286b7e74c7a..ceac925af38c 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c @@ -20,7 +20,6 @@ #include #include "edac_module.h" -#define I82875P_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "i82875p_edac" #define i82875p_printk(level, fmt, arg...) \ @@ -423,7 +422,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_UNKNOWN; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82875P_REVISION; mci->ctl_name = i82875p_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82875p_check; diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 9dcdab28f665..892815eaa97b 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c @@ -16,7 +16,6 @@ #include #include "edac_module.h" -#define I82975X_REVISION " Ver: 1.0.0" #define EDAC_MOD_STR "i82975x_edac" #define i82975x_printk(level, fmt, arg...) \ @@ -564,7 +563,6 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = I82975X_REVISION; mci->ctl_name = i82975x_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = i82975x_check; diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index 4260579e6901..aac9b9b360b8 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -45,7 +45,6 @@ #include #include "edac_module.h" -#define IE31200_REVISION "1.0" #define EDAC_MOD_STR "ie31200_edac" #define ie31200_printk(level, fmt, arg...) \ @@ -420,7 +419,6 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = IE31200_REVISION; mci->ctl_name = ie31200_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = ie31200_check; diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index d3650df94fe8..ec5d695bbb72 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -766,7 +766,6 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = MV64x60_REVISION; mci->ctl_name = mv64x60_ctl_name; if (edac_op_state == EDAC_OPSTATE_POLL) diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index e55e92590106..98d6dc7ef8e8 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c @@ -1063,7 +1063,6 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci, /* Initialize strings */ mci->mod_name = PPC4XX_EDAC_MODULE_NAME; - mci->mod_ver = PPC4XX_EDAC_MODULE_REVISION; mci->ctl_name = ppc4xx_edac_match->compatible, mci->dev_name = np->full_name; diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index 978916625ced..851e53e122aa 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c @@ -22,7 +22,6 @@ #include #include "edac_module.h" -#define R82600_REVISION " Ver: 2.0.2" #define EDAC_MOD_STR "r82600_edac" #define r82600_printk(level, fmt, arg...) \ @@ -316,7 +315,6 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = R82600_REVISION; mci->ctl_name = "R82600"; mci->dev_name = pci_name(pdev); mci->edac_check = r82600_check; diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 80d860cb0746..687d0f23b9cc 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -3125,7 +3125,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "sb_edac.c"; - mci->mod_ver = SBRIDGE_REVISION; mci->dev_name = pci_name(pdev); mci->ctl_page_to_phys = NULL; diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c index 64bef6c9cfb4..16dea97568a1 100644 --- a/drivers/edac/skx_edac.c +++ b/drivers/edac/skx_edac.c @@ -31,8 +31,6 @@ #include "edac_module.h" -#define SKX_REVISION " Ver: 1.0 " - /* * Debug macros */ @@ -473,7 +471,6 @@ static int skx_register_mci(struct skx_imc *imc) mci->edac_cap = EDAC_FLAG_NONE; mci->mod_name = "skx_edac.c"; mci->dev_name = pci_name(imc->chan[0].cdev); - mci->mod_ver = SKX_REVISION; mci->ctl_page_to_phys = NULL; rc = skx_get_dimm_config(mci); diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 1c01dec78ec3..0c9c59e2b5a3 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -413,7 +413,6 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, mci->ctl_name = "synps_ddr_controller"; mci->dev_name = SYNPS_EDAC_MOD_STRING; mci->mod_name = SYNPS_EDAC_MOD_VER; - mci->mod_ver = "1"; edac_op_state = EDAC_OPSTATE_POLL; mci->edac_check = synps_edac_check; diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index 2d352b40ae1c..c8e8b9fd4772 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -732,7 +732,6 @@ static int thunderx_lmc_probe(struct pci_dev *pdev, mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = "thunderx-lmc"; - mci->mod_ver = "1"; mci->ctl_name = "thunderx-lmc"; mci->dev_name = dev_name(&pdev->dev); mci->scrub_mode = SCRUB_NONE; diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c index 03c97a4bf590..cc779f3f9e2d 100644 --- a/drivers/edac/x38_edac.c +++ b/drivers/edac/x38_edac.c @@ -18,8 +18,6 @@ #include #include "edac_module.h" -#define X38_REVISION "1.1" - #define EDAC_MOD_STR "x38_edac" #define PCI_DEVICE_ID_INTEL_X38_HB 0x29e0 @@ -357,7 +355,6 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = X38_REVISION; mci->ctl_name = x38_devs[dev_idx].ctl_name; mci->dev_name = pci_name(pdev); mci->edac_check = x38_check; diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c index 669246056812..e8b81d7ef61f 100644 --- a/drivers/edac/xgene_edac.c +++ b/drivers/edac/xgene_edac.c @@ -415,7 +415,6 @@ static int xgene_edac_mc_add(struct xgene_edac *edac, struct device_node *np) mci->edac_ctl_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; - mci->mod_ver = "0.1"; mci->ctl_page_to_phys = NULL; mci->scrub_cap = SCRUB_FLAG_HW_SRC; mci->scrub_mode = SCRUB_HW_SRC; diff --git a/include/linux/edac.h b/include/linux/edac.h index 8ae0f45fafd6..cd75c173fd00 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -619,7 +619,6 @@ struct mem_ctl_info { */ struct device *pdev; const char *mod_name; - const char *mod_ver; const char *ctl_name; const char *dev_name; void *pvt_info; -- 2.13.0 -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.