lkml.org 
[lkml]   [2021]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 09/10] hwmon: adt7x10: use devm_hwmon_device_register_with_info
    Date
    From: Cosmin Tanislav <cosmin.tanislav@analog.com>

    To simplify core driver remove function.

    Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com>
    ---
    drivers/hwmon/adt7x10.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    diff --git a/drivers/hwmon/adt7x10.c b/drivers/hwmon/adt7x10.c
    index dd4901299590..c03805c72906 100644
    --- a/drivers/hwmon/adt7x10.c
    +++ b/drivers/hwmon/adt7x10.c
    @@ -54,7 +54,6 @@
    /* Each client has this additional data */
    struct adt7x10_data {
    const struct adt7x10_ops *ops;
    - struct device *hwmon_dev;
    struct device *bus_dev;
    struct mutex update_lock;
    u8 config;
    @@ -430,8 +429,8 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
    if (ret)
    goto exit_restore;

    - hdev = hwmon_device_register_with_info(dev, name, data,
    - &adt7x10_chip_info, NULL);
    + hdev = devm_hwmon_device_register_with_info(dev, name, data,
    + &adt7x10_chip_info, NULL);

    if (IS_ERR(hdev)) {
    ret = PTR_ERR(hdev);
    @@ -445,15 +444,11 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
    IRQF_ONESHOT,
    dev_name(dev), hdev);
    if (ret)
    - goto exit_hwmon_device_unregister;
    + goto exit_restore;
    }

    - data->hwmon_dev = hdev;
    -
    return 0;

    -exit_hwmon_device_unregister:
    - hwmon_device_unregister(hdev);
    exit_restore:
    adt7x10_write_byte(dev, ADT7X10_CONFIG, data->oldconfig);
    return ret;
    @@ -464,7 +459,6 @@ void adt7x10_remove(struct device *dev, int irq)
    {
    struct adt7x10_data *data = dev_get_drvdata(dev);

    - hwmon_device_unregister(data->hwmon_dev);
    if (data->oldconfig != data->config)
    adt7x10_write_byte(dev, ADT7X10_CONFIG, data->oldconfig);
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2021-12-21 13:40    [W:3.413 / U:0.976 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site