lkml.org 
[lkml]   [2019]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/19] hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages
    Date
    From: Len Brown <len.brown@intel.com>

    Syntax update only -- no logical or functional change.

    In response to the new multi-die/package changes, update variable names
    to use the more generic thermal "zone" terminology, instead of "package",
    as the zones can refer to either packages or die.

    Signed-off-by: Len Brown <len.brown@intel.com>
    Cc: Zhang Rui <rui.zhang@intel.com>
    ---
    drivers/hwmon/coretemp.c | 36 ++++++++++++++++++------------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
    index c64ce32d3214..4ebed90d81aa 100644
    --- a/drivers/hwmon/coretemp.c
    +++ b/drivers/hwmon/coretemp.c
    @@ -109,10 +109,10 @@ struct platform_data {
    struct device_attribute name_attr;
    };

    -/* Keep track of how many package pointers we allocated in init() */
    -static int max_packages __read_mostly;
    -/* Array of package pointers. Serialized by cpu hotplug lock */
    -static struct platform_device **pkg_devices;
    +/* Keep track of how many zone pointers we allocated in init() */
    +static int max_zones __read_mostly;
    +/* Array of zone pointers. Serialized by cpu hotplug lock */
    +static struct platform_device **zone_devices;

    static ssize_t show_label(struct device *dev,
    struct device_attribute *devattr, char *buf)
    @@ -435,10 +435,10 @@ static int chk_ucode_version(unsigned int cpu)

    static struct platform_device *coretemp_get_pdev(unsigned int cpu)
    {
    - int pkgid = topology_logical_die_id(cpu);
    + int id = topology_logical_die_id(cpu);

    - if (pkgid >= 0 && pkgid < max_packages)
    - return pkg_devices[pkgid];
    + if (id >= 0 && id < max_zones)
    + return zone_devices[id];
    return NULL;
    }

    @@ -544,7 +544,7 @@ static int coretemp_probe(struct platform_device *pdev)
    struct device *dev = &pdev->dev;
    struct platform_data *pdata;

    - /* Initialize the per-package data structures */
    + /* Initialize the per-zone data structures */
    pdata = devm_kzalloc(dev, sizeof(struct platform_data), GFP_KERNEL);
    if (!pdata)
    return -ENOMEM;
    @@ -579,13 +579,13 @@ static struct platform_driver coretemp_driver = {

    static struct platform_device *coretemp_device_add(unsigned int cpu)
    {
    - int err, pkgid = topology_logical_die_id(cpu);
    + int err, zoneid = topology_logical_die_id(cpu);
    struct platform_device *pdev;

    - if (pkgid < 0)
    + if (zoneid < 0)
    return ERR_PTR(-ENOMEM);

    - pdev = platform_device_alloc(DRVNAME, pkgid);
    + pdev = platform_device_alloc(DRVNAME, zoneid);
    if (!pdev)
    return ERR_PTR(-ENOMEM);

    @@ -595,7 +595,7 @@ static struct platform_device *coretemp_device_add(unsigned int cpu)
    return ERR_PTR(err);
    }

    - pkg_devices[pkgid] = pdev;
    + zone_devices[zoneid] = pdev;
    return pdev;
    }

    @@ -703,7 +703,7 @@ static int coretemp_cpu_offline(unsigned int cpu)
    * the rest.
    */
    if (cpumask_empty(&pd->cpumask)) {
    - pkg_devices[topology_logical_die_id(cpu)] = NULL;
    + zone_devices[topology_logical_die_id(cpu)] = NULL;
    platform_device_unregister(pdev);
    return 0;
    }
    @@ -741,10 +741,10 @@ static int __init coretemp_init(void)
    if (!x86_match_cpu(coretemp_ids))
    return -ENODEV;

    - max_packages = topology_max_packages() * topology_max_die_per_package();
    - pkg_devices = kcalloc(max_packages, sizeof(struct platform_device *),
    + max_zones = topology_max_packages() * topology_max_die_per_package();
    + zone_devices = kcalloc(max_zones, sizeof(struct platform_device *),
    GFP_KERNEL);
    - if (!pkg_devices)
    + if (!zone_devices)
    return -ENOMEM;

    err = platform_driver_register(&coretemp_driver);
    @@ -760,7 +760,7 @@ static int __init coretemp_init(void)

    outdrv:
    platform_driver_unregister(&coretemp_driver);
    - kfree(pkg_devices);
    + kfree(zone_devices);
    return err;
    }
    module_init(coretemp_init)
    @@ -769,7 +769,7 @@ static void __exit coretemp_exit(void)
    {
    cpuhp_remove_state(coretemp_hp_online);
    platform_driver_unregister(&coretemp_driver);
    - kfree(pkg_devices);
    + kfree(zone_devices);
    }
    module_exit(coretemp_exit)

    --
    2.18.0-rc0
    \
     
     \ /
      Last update: 2019-05-13 20:01    [W:4.255 / U:1.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site