On 05/27/2013 08:11 PM, Sebastian Andrzej Siewior wrote:
> This patch removes access to platform data mfd_tscadc_board because the
> platform is DT only.
>
> Signed-off-by: Sebastian Andrzej Siewior <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
> ---
> drivers/iio/adc/ti_am335x_adc.c | 26 ++++++++++----------------
> 1 file changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
> index e657709..d821d88 100644
> --- a/drivers/iio/adc/ti_am335x_adc.c
> +++ b/drivers/iio/adc/ti_am335x_adc.c
> @@ -26,7 +26,6 @@
> #include <linux/of_device.h>
>
> #include <linux/mfd/ti_am335x_tscadc.h>
> -#include <linux/platform_data/ti_am335x_adc.h>
>
> struct tiadc_device {
> struct ti_tscadc_dev *mfd_tscadc;
> @@ -143,13 +142,12 @@ static int tiadc_probe(struct platform_device *pdev)
> struct iio_dev *indio_dev;
> struct tiadc_device *adc_dev;
> struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data;
> - struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
> struct device_node *node = tscadc_dev->dev->of_node;
> int err;
> u32 val32;
>
> - if (!pdata && !node) {
> - dev_err(&pdev->dev, "Could not find platform data\n");
> + if (!node) {
> + dev_err(&pdev->dev, "Could not find valid DT data.\n");
> return -EINVAL;
> }
>
> @@ -163,18 +161,14 @@ static int tiadc_probe(struct platform_device *pdev)
>
> adc_dev->mfd_tscadc = tscadc_dev;
>
> - if (pdata)
> - adc_dev->channels = pdata->adc_init->adc_channels;
> - else {
> - node = of_get_child_by_name(node, "adc");
> - if (!node)
> - return -EINVAL;
> - err = of_property_read_u32(node,
> - "ti,adc-channels", &val32);
> - if (err < 0)
> - goto err_free_device;
> - adc_dev->channels = val32;
> - }
> + node = of_get_child_by_name(node, "adc");
> + if (!node)
> + return -EINVAL;
> + err = of_property_read_u32(node,
> + "ti,adc-channels", &val32);
> + if (err < 0)
> + goto err_free_device;
> + adc_dev->channels = val32;
>
> indio_dev->dev.parent = &pdev->dev;
> indio_dev->name = dev_name(&pdev->dev);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
