lkml.org 
[lkml]   [2011]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH] IIO:hwmon interface client driver.
    From
    Date
    Hi Jonathan,

    I know I must be getting annoying, but somehow it seems I just keep
    finding something whenever I look at the code again.

    On Mon, 2011-11-07 at 12:43 -0500, Jonathan Cameron wrote:
    > From: Jonathan Cameron <jic23@cam.ac.uk>
    >
    > Should move to drivers/hwmon once people are happy with it.
    >
    > Minimal support of simple in, curr and temp attributes
    > so far.
    >
    > Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
    > ---
    > Fixed up the missing free Guenter spotted.
    > Thanks!
    > drivers/iio/Kconfig | 8 ++
    > drivers/iio/Makefile | 1 +
    > drivers/iio/iio_hwmon.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++
    > 3 files changed, 237 insertions(+), 0 deletions(-)
    > create mode 100644 drivers/iio/iio_hwmon.c
    >
    > diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
    > index 308bc97..c2f0970 100644
    > --- a/drivers/iio/Kconfig
    > +++ b/drivers/iio/Kconfig
    > @@ -11,6 +11,14 @@ menuconfig IIO
    >
    > if IIO
    >
    > +config IIO_HWMON
    > + tristate "Hwmon driver that uses channels specified via iio maps"
    > + depends on HWMON
    > + help
    > + This is a platform driver that in combination with a suitable
    > + map allows IIO devices to provide basic hwmon functionality
    > + for those channels specified in the map.
    > +
    > source "drivers/iio/adc/Kconfig"
    > source "drivers/iio/imu/Kconfig"
    > source "drivers/iio/light/Kconfig"
    > diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
    > index cfb588a..5f9c01a 100644
    > --- a/drivers/iio/Makefile
    > +++ b/drivers/iio/Makefile
    > @@ -6,6 +6,7 @@ obj-y = inkern.o
    > obj-$(CONFIG_IIO) += iio.o
    > industrialio-y := core.o
    >
    > +obj-$(CONFIG_IIO_HWMON) += iio_hwmon.o
    > obj-y += adc/
    > obj-y += imu/
    > obj-y += light/
    > diff --git a/drivers/iio/iio_hwmon.c b/drivers/iio/iio_hwmon.c
    > new file mode 100644
    > index 0000000..880ce6d
    > --- /dev/null
    > +++ b/drivers/iio/iio_hwmon.c
    > @@ -0,0 +1,228 @@
    > +/* Hwmon client for industrial I/O devices
    > + *
    > + * Copyright (c) 2011 Jonathan Cameron
    > + *
    > + * This program is free software; you can redistribute it and/or modify it
    > + * under the terms of the GNU General Public License version 2 as published by
    > + * the Free Software Foundation.
    > + *
    > + * Limited functionality currently supported.
    > + */
    > +
    > +#include <linux/kernel.h>
    > +#include <linux/slab.h>
    > +#include <linux/module.h>
    > +#include <linux/err.h>
    > +#include <linux/platform_device.h>
    > +#include <linux/iio/inkern.h>
    > +#include <linux/hwmon.h>
    > +#include <linux/hwmon-sysfs.h>
    > +
    > +/**
    > + * struct iio_hwmon_state - device instance state
    > + * @channels: filled with null terminated array of channels from iio
    > + * @num_channels: number of channels in channels (saves counting twice)
    > + * @hwmon_dev: associated hwmon device
    > + * @attr_group: the group of attributes
    > + * @attrs: null terminated array of attribute pointers.
    > + */
    > +struct iio_hwmon_state {
    > + struct iio_channel **channels;
    > + int num_channels;
    > + struct device *hwmon_dev;
    > + struct attribute_group attr_group;
    > + struct attribute **attrs;
    > +};
    > +
    > +/*
    > + * Assumes that IIO and hwmon operate in the same base units.
    > + * This is supposed to be true, but needs verification for
    > + * new channel types.
    > + */
    > +static ssize_t iio_hwmon_read_val(struct device *dev,
    > + struct device_attribute *attr,
    > + char *buf)
    > +{
    > + long result;
    > + int val, ret, scaleint, scalepart;
    > + struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
    > + struct iio_hwmon_state *state = dev_get_drvdata(dev);
    > +
    > + /*
    > + * No locking between this pair, so theoretically possible
    > + * the scale has changed.
    > + */
    > + ret = iio_read_channel_raw(state->channels[sattr->index],
    > + &val);
    > + if (ret < 0)
    > + return ret;
    > +
    > + ret = iio_read_channel_scale(state->channels[sattr->index],
    > + &scaleint, &scalepart);
    > + if (ret < 0)
    > + return ret;
    > + switch (ret) {
    > + case IIO_VAL_INT:
    > + result = val * scaleint;
    > + break;
    > + case IIO_VAL_INT_PLUS_MICRO:
    > + result = (long)val * (long)scaleint +
    > + div_s64((s64)val * (s64)scalepart, 1000000LL);
    > + break;
    > + case IIO_VAL_INT_PLUS_NANO:
    > + result = (long)val * (long)scaleint +
    > + div_s64((s64)val * (s64)scalepart, 1000000000LL);
    > + break;
    > + default:
    > + return -EINVAL;
    > + }
    > + return sprintf(buf, "%ld\n", result);
    > +}
    > +
    > +static void iio_hwmon_free_attrs(struct iio_hwmon_state *st)
    > +{
    > + int i;
    > + struct sensor_device_attribute *a;
    > + for (i = 0; i < st->num_channels; i++)
    > + if (st->attrs[i]) {
    > + a = to_sensor_dev_attr(
    > + container_of(st->attrs[i],
    > + struct device_attribute,
    > + attr));

    I finally looked into kasprintf ... which as it turns out allocates
    memory. Yet, there is no kfree(a->dev_attr.attr.name).

    Thanks,
    Guenter





    \
     
     \ /
      Last update: 2011-11-07 18:57    [W:0.035 / U:0.924 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site