From 3bc04219f909fc9701ab83a3a3d19f8433ecda58 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 23 Sep 2011 06:40:08 -0400 Subject: [PATCH] --- yaml --- r: 264127 b: refs/heads/master c: 2f1c3db0a6adcfd12d556afa3605d4923658b307 h: refs/heads/master i: 264125: 1df71562e2968fc29f473a55af160a630e69a8e0 264123: 0fde02bf890dd8bfd1f5341523a30ea773feb9c1 264119: 70e5d691b9a8b7bd6d445209653a84ec519f5ba6 264111: f3c6f6d5a3db66159cba1f5f4b54005ac5c8e345 264095: 06b85ca6e04bd12e3d2ddc8ca65a92e1beb14792 264063: 5d7ea9b5cc558a9603a5ede41b6bbd9888a61572 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/coretemp.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9862c3185a95..557a0071eef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3204ed3a4a78ca4d10eee8b661b94429bd38da8 +refs/heads/master: 2f1c3db0a6adcfd12d556afa3605d4923658b307 diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index ac1c81f1d593..44b23917d4cc 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -442,11 +442,11 @@ static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag) return tdata; } -static int create_core_data(struct platform_data *pdata, - struct platform_device *pdev, +static int create_core_data(struct platform_device *pdev, unsigned int cpu, int pkg_flag) { struct temp_data *tdata; + struct platform_data *pdata = platform_get_drvdata(pdev); struct cpuinfo_x86 *c = &cpu_data(cpu); u32 eax, edx; int err, attr_no; @@ -514,16 +514,13 @@ static int create_core_data(struct platform_data *pdata, static void coretemp_add_core(unsigned int cpu, int pkg_flag) { - struct platform_data *pdata; struct platform_device *pdev = coretemp_get_pdev(cpu); int err; if (!pdev) return; - pdata = platform_get_drvdata(pdev); - - err = create_core_data(pdata, pdev, cpu, pkg_flag); + err = create_core_data(pdev, cpu, pkg_flag); if (err) dev_err(&pdev->dev, "Adding Core %u failed\n", cpu); }