libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op

[linux-2.6-block.git] / drivers / hwmon / iio_hwmon.c

diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
index 17ae2eb26ce21604edf9a1d9df4e24abe01980d6..b550ba5fa58a9050c178483b47a68c2267e9d8b2 100644 (file)
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
@@ -67,6 +67,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
        enum iio_chan_type type;
        struct iio_channel *channels;
        const char *name = "iio_hwmon";
+       char *sname;
 
        if (dev->of_node && dev->of_node->name)
                name = dev->of_node->name;
@@ -144,7 +145,15 @@ static int iio_hwmon_probe(struct platform_device *pdev)
 
        st->attr_group.attrs = st->attrs;
        st->groups[0] = &st->attr_group;
-       st->hwmon_dev = hwmon_device_register_with_groups(dev, name, st,
+
+       sname = devm_kstrdup(dev, name, GFP_KERNEL);
+       if (!sname) {
+               ret = -ENOMEM;
+               goto error_release_channels;
+       }
+
+       strreplace(sname, '-', '_');
+       st->hwmon_dev = hwmon_device_register_with_groups(dev, sname, st,
                                                          st->groups);
        if (IS_ERR(st->hwmon_dev)) {
                ret = PTR_ERR(st->hwmon_dev);