From c0b850e6c42b14f00d525aad00e0f3caca5983c7 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Tue, 16 Oct 2012 09:02:27 -0400 Subject: [PATCH] --- yaml --- r: 336215 b: refs/heads/master c: 42709efb3a47524c6252e1bdc85e205f7bc356fb h: refs/heads/master i: 336213: dddc1e5fb57f2d5a7a19d4419cadd347f079e785 336211: 3cc9c2d3ddd3e768b250b4098d33972edde4930d 336207: 469fd9e2d40421c6888284a004b19d95cf8457c6 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 285644497575..ebdea9c8ba5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e06b7a3333f5c7a0cec12aff20d39c5c87c0795 +refs/heads/master: 42709efb3a47524c6252e1bdc85e205f7bc356fb diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index 3672101023bd..10c8c00d6469 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -816,7 +816,7 @@ static ssize_t i7core_inject_store_##param( \ struct device_attribute *mattr, \ const char *data, size_t count) \ { \ - struct mem_ctl_info *mci = to_mci(dev); \ + struct mem_ctl_info *mci = dev_get_drvdata(dev); \ struct i7core_pvt *pvt; \ long value; \ int rc; \ @@ -845,7 +845,7 @@ static ssize_t i7core_inject_show_##param( \ struct device_attribute *mattr, \ char *data) \ { \ - struct mem_ctl_info *mci = to_mci(dev); \ + struct mem_ctl_info *mci = dev_get_drvdata(dev); \ struct i7core_pvt *pvt; \ \ pvt = mci->pvt_info; \ @@ -1052,7 +1052,7 @@ static ssize_t i7core_show_counter_##param( \ struct device_attribute *mattr, \ char *data) \ { \ - struct mem_ctl_info *mci = to_mci(dev); \ + struct mem_ctl_info *mci = dev_get_drvdata(dev); \ struct i7core_pvt *pvt = mci->pvt_info; \ \ edac_dbg(1, "\n"); \