| Message ID | 20170427153012.32310-5-sebastian.reichel@collabora.co.uk (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 27/04/17 16:30, Sebastian Reichel wrote: > All madc users have been converted to IIO API, so drop the > legacy API. The function is still used inside of the driver. > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Acked-by: Jonathan Cameron <jic23@kernel.org> > --- > drivers/iio/adc/twl4030-madc.c | 5 +++-- > include/linux/i2c/twl4030-madc.h | 2 -- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c > index 88e44066ef82..be60f76d1a50 100644 > --- a/drivers/iio/adc/twl4030-madc.c > +++ b/drivers/iio/adc/twl4030-madc.c > @@ -72,6 +72,8 @@ struct twl4030_madc_data { > u8 isr; > }; > > +static int twl4030_madc_conversion(struct twl4030_madc_request *req); > + > static int twl4030_madc_read(struct iio_dev *iio_dev, > const struct iio_chan_spec *chan, > int *val, int *val2, long mask) > @@ -568,7 +570,7 @@ static int twl4030_madc_wait_conversion_ready(struct twl4030_madc_data *madc, > * be a negative error value in the corresponding array element. > * returns 0 if succeeds else error value > */ > -int twl4030_madc_conversion(struct twl4030_madc_request *req) > +static int twl4030_madc_conversion(struct twl4030_madc_request *req) > { > const struct twl4030_madc_conversion_method *method; > int ret; > @@ -640,7 +642,6 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) > > return ret; > } > -EXPORT_SYMBOL_GPL(twl4030_madc_conversion); > > /** > * twl4030_madc_set_current_generator() - setup bias current > diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h > index 0c919ebb31e0..be9260e261ac 100644 > --- a/include/linux/i2c/twl4030-madc.h > +++ b/include/linux/i2c/twl4030-madc.h > @@ -141,6 +141,4 @@ struct twl4030_madc_user_parms { > int status; > u16 result; > }; > - > -int twl4030_madc_conversion(struct twl4030_madc_request *conv); > #endif > -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 30 Apr 2017 17:35:47 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On 27/04/17 16:30, Sebastian Reichel wrote: > > All madc users have been converted to IIO API, so drop the > > legacy API. The function is still used inside of the driver. > > > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > Acked-by: Jonathan Cameron <jic23@kernel.org> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with them. thanks, Jonathan > > --- > > drivers/iio/adc/twl4030-madc.c | 5 +++-- > > include/linux/i2c/twl4030-madc.h | 2 -- > > 2 files changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c > > index 88e44066ef82..be60f76d1a50 100644 > > --- a/drivers/iio/adc/twl4030-madc.c > > +++ b/drivers/iio/adc/twl4030-madc.c > > @@ -72,6 +72,8 @@ struct twl4030_madc_data { > > u8 isr; > > }; > > > > +static int twl4030_madc_conversion(struct twl4030_madc_request *req); > > + > > static int twl4030_madc_read(struct iio_dev *iio_dev, > > const struct iio_chan_spec *chan, > > int *val, int *val2, long mask) > > @@ -568,7 +570,7 @@ static int twl4030_madc_wait_conversion_ready(struct twl4030_madc_data *madc, > > * be a negative error value in the corresponding array element. > > * returns 0 if succeeds else error value > > */ > > -int twl4030_madc_conversion(struct twl4030_madc_request *req) > > +static int twl4030_madc_conversion(struct twl4030_madc_request *req) > > { > > const struct twl4030_madc_conversion_method *method; > > int ret; > > @@ -640,7 +642,6 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) > > > > return ret; > > } > > -EXPORT_SYMBOL_GPL(twl4030_madc_conversion); > > > > /** > > * twl4030_madc_set_current_generator() - setup bias current > > diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h > > index 0c919ebb31e0..be9260e261ac 100644 > > --- a/include/linux/i2c/twl4030-madc.h > > +++ b/include/linux/i2c/twl4030-madc.h > > @@ -141,6 +141,4 @@ struct twl4030_madc_user_parms { > > int status; > > u16 result; > > }; > > - > > -int twl4030_madc_conversion(struct twl4030_madc_request *conv); > > #endif > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c index 88e44066ef82..be60f76d1a50 100644 --- a/drivers/iio/adc/twl4030-madc.c +++ b/drivers/iio/adc/twl4030-madc.c @@ -72,6 +72,8 @@ struct twl4030_madc_data { u8 isr; }; +static int twl4030_madc_conversion(struct twl4030_madc_request *req); + static int twl4030_madc_read(struct iio_dev *iio_dev, const struct iio_chan_spec *chan, int *val, int *val2, long mask) @@ -568,7 +570,7 @@ static int twl4030_madc_wait_conversion_ready(struct twl4030_madc_data *madc, * be a negative error value in the corresponding array element. * returns 0 if succeeds else error value */ -int twl4030_madc_conversion(struct twl4030_madc_request *req) +static int twl4030_madc_conversion(struct twl4030_madc_request *req) { const struct twl4030_madc_conversion_method *method; int ret; @@ -640,7 +642,6 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) return ret; } -EXPORT_SYMBOL_GPL(twl4030_madc_conversion); /** * twl4030_madc_set_current_generator() - setup bias current diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h index 0c919ebb31e0..be9260e261ac 100644 --- a/include/linux/i2c/twl4030-madc.h +++ b/include/linux/i2c/twl4030-madc.h @@ -141,6 +141,4 @@ struct twl4030_madc_user_parms { int status; u16 result; }; - -int twl4030_madc_conversion(struct twl4030_madc_request *conv); #endif
All madc users have been converted to IIO API, so drop the legacy API. The function is still used inside of the driver. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> --- drivers/iio/adc/twl4030-madc.c | 5 +++-- include/linux/i2c/twl4030-madc.h | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-)