]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
hwmon: (coretemp) Avoid redundant lookups
authorThomas Gleixner <tglx@linutronix.de>
Tue, 22 Nov 2016 17:42:03 +0000 (17:42 +0000)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 10 Dec 2016 05:54:09 +0000 (21:54 -0800)
No point in looking up the same thing over and over.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/coretemp.c

index cda09cf2e84b1cb195b7946d10808a7fafdd6a96..1bcc90a20ed1b48b8af8c3289d7a0bc0b167ad90 100644 (file)
@@ -533,21 +533,14 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,
        return err;
 }
 
-static void coretemp_add_core(unsigned int cpu, int pkg_flag)
+static void
+coretemp_add_core(struct platform_device *pdev, unsigned int cpu, int pkg_flag)
 {
-       struct platform_device *pdev = coretemp_get_pdev(cpu);
-       int err;
-
-       if (!pdev)
-               return;
-
-       err = create_core_data(pdev, cpu, pkg_flag);
-       if (err)
+       if (create_core_data(pdev, cpu, pkg_flag))
                dev_err(&pdev->dev, "Adding Core %u failed\n", cpu);
 }
 
-static void coretemp_remove_core(struct platform_data *pdata,
-                                int indx)
+static void coretemp_remove_core(struct platform_data *pdata, int indx)
 {
        struct temp_data *tdata = pdata->core_data[indx];
 
@@ -692,7 +685,7 @@ static void get_core_online(unsigned int cpu)
                 * If so, add interfaces for pkgtemp.
                 */
                if (cpu_has(c, X86_FEATURE_PTS))
-                       coretemp_add_core(cpu, 1);
+                       coretemp_add_core(pdev, cpu, 1);
        }
 
        pdata = platform_get_drvdata(pdev);
@@ -701,7 +694,7 @@ static void get_core_online(unsigned int cpu)
         * interface for this CPU core.
         */
        if (!cpumask_intersects(&pdata->cpumask, topology_sibling_cpumask(cpu)))
-               coretemp_add_core(cpu, 0);
+               coretemp_add_core(pdev, cpu, 0);
 
        cpumask_set_cpu(cpu, &pdata->cpumask);
 }