---

yaml --- r: 264127 b: refs/heads/master c: 2f1c3db h: refs/heads/master i: 264125: 1df7156 264123: 0fde02b 264119: 70e5d69 264111: f3c6f6d 264095: 06b85ca 264063: 5d7ea9b v: v3
git-mirror · Sep 23, 2011 · 3bc0421 · 3bc0421
1 parent b5daa08
commit 3bc0421
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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);
 }