Commit 0cd9ff15 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: adc: ti-ads1015: Get rid of legacy platform data 



Platform data is a legacy interface to supply device properties
to the driver. In this case we even don't have in-kernel users
for it. Just remove it for good.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 32bd4324

drivers/iio/adc/ti-ads1015.c

+8 −10
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <linux/mutex.h>

#include <linux/delay.h>



#include <linux/platform_data/ads1015.h>



#include <linux/iio/iio.h>

#include <linux/iio/types.h>

#include <linux/iio/sysfs.h>
@@ -33,6 +31,8 @@ 


#define ADS1015_DRV_NAME "ads1015"



#define ADS1015_CHANNELS 8



#define ADS1015_CONV_REG	0x00

#define ADS1015_CFG_REG		0x01

#define ADS1015_LO_THRESH_REG	0x02
@@ -219,6 +219,12 @@ static const struct iio_event_spec ads1015_events[] = { 
	.datasheet_name = "AIN"#_chan"-AIN"#_chan2,		\

}



struct ads1015_channel_data {

	bool enabled;

	unsigned int pga;

	unsigned int data_rate;

};



struct ads1015_thresh_data {

	unsigned int comp_queue;

	int high_thresh;
@@ -903,14 +909,6 @@ static void ads1015_get_channels_config(struct i2c_client *client) 


	struct iio_dev *indio_dev = i2c_get_clientdata(client);

	struct ads1015_data *data = iio_priv(indio_dev);

	struct ads1015_platform_data *pdata = dev_get_platdata(&client->dev);



	/* prefer platform data */

	if (pdata) {

		memcpy(data->channel_data, pdata->channel_data,

		       sizeof(data->channel_data));

		return;

	}



#ifdef CONFIG_OF

	if (!ads1015_get_channels_config_of(client))

include/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ header-test- += linux/platform_data/ad7793.h 
header-test-			+= linux/platform_data/ad7887.h

header-test-			+= linux/platform_data/adau17x1.h

header-test-			+= linux/platform_data/adp8870.h

header-test-			+= linux/platform_data/ads1015.h

header-test-			+= linux/platform_data/ads7828.h

header-test-			+= linux/platform_data/apds990x.h

header-test-			+= linux/platform_data/arm-ux500-pm.h

include/linux/platform_data/ads1015.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Platform Data for ADS1015 12-bit 4-input ADC

 * (C) Copyright 2010

 * Dirk Eibach, Guntermann & Drunck GmbH <eibach@gdsys.de>

 */



#ifndef LINUX_ADS1015_H

#define LINUX_ADS1015_H



#define ADS1015_CHANNELS 8



struct ads1015_channel_data {

	bool enabled;

	unsigned int pga;

	unsigned int data_rate;

};



struct ads1015_platform_data {

	struct ads1015_channel_data channel_data[ADS1015_CHANNELS];

};



#endif /* LINUX_ADS1015_H */