iio: potentiometer: mcp4531: switch to using .probe_new (c18af98b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/iio/potentiometer/mcp4531.c

+72 −73

Original line number	Original line	Diff line number	Diff line
	@@ -209,6 +209,75 @@ static const struct iio_info mcp4531_info = {
	.write_raw = mcp4531_write_raw,		.write_raw = mcp4531_write_raw,
	};		};

			static const struct i2c_device_id mcp4531_id[] = {
			{ "mcp4531-502", MCP453x_502 },
			{ "mcp4531-103", MCP453x_103 },
			{ "mcp4531-503", MCP453x_503 },
			{ "mcp4531-104", MCP453x_104 },
			{ "mcp4532-502", MCP453x_502 },
			{ "mcp4532-103", MCP453x_103 },
			{ "mcp4532-503", MCP453x_503 },
			{ "mcp4532-104", MCP453x_104 },
			{ "mcp4541-502", MCP454x_502 },
			{ "mcp4541-103", MCP454x_103 },
			{ "mcp4541-503", MCP454x_503 },
			{ "mcp4541-104", MCP454x_104 },
			{ "mcp4542-502", MCP454x_502 },
			{ "mcp4542-103", MCP454x_103 },
			{ "mcp4542-503", MCP454x_503 },
			{ "mcp4542-104", MCP454x_104 },
			{ "mcp4551-502", MCP455x_502 },
			{ "mcp4551-103", MCP455x_103 },
			{ "mcp4551-503", MCP455x_503 },
			{ "mcp4551-104", MCP455x_104 },
			{ "mcp4552-502", MCP455x_502 },
			{ "mcp4552-103", MCP455x_103 },
			{ "mcp4552-503", MCP455x_503 },
			{ "mcp4552-104", MCP455x_104 },
			{ "mcp4561-502", MCP456x_502 },
			{ "mcp4561-103", MCP456x_103 },
			{ "mcp4561-503", MCP456x_503 },
			{ "mcp4561-104", MCP456x_104 },
			{ "mcp4562-502", MCP456x_502 },
			{ "mcp4562-103", MCP456x_103 },
			{ "mcp4562-503", MCP456x_503 },
			{ "mcp4562-104", MCP456x_104 },
			{ "mcp4631-502", MCP463x_502 },
			{ "mcp4631-103", MCP463x_103 },
			{ "mcp4631-503", MCP463x_503 },
			{ "mcp4631-104", MCP463x_104 },
			{ "mcp4632-502", MCP463x_502 },
			{ "mcp4632-103", MCP463x_103 },
			{ "mcp4632-503", MCP463x_503 },
			{ "mcp4632-104", MCP463x_104 },
			{ "mcp4641-502", MCP464x_502 },
			{ "mcp4641-103", MCP464x_103 },
			{ "mcp4641-503", MCP464x_503 },
			{ "mcp4641-104", MCP464x_104 },
			{ "mcp4642-502", MCP464x_502 },
			{ "mcp4642-103", MCP464x_103 },
			{ "mcp4642-503", MCP464x_503 },
			{ "mcp4642-104", MCP464x_104 },
			{ "mcp4651-502", MCP465x_502 },
			{ "mcp4651-103", MCP465x_103 },
			{ "mcp4651-503", MCP465x_503 },
			{ "mcp4651-104", MCP465x_104 },
			{ "mcp4652-502", MCP465x_502 },
			{ "mcp4652-103", MCP465x_103 },
			{ "mcp4652-503", MCP465x_503 },
			{ "mcp4652-104", MCP465x_104 },
			{ "mcp4661-502", MCP466x_502 },
			{ "mcp4661-103", MCP466x_103 },
			{ "mcp4661-503", MCP466x_503 },
			{ "mcp4661-104", MCP466x_104 },
			{ "mcp4662-502", MCP466x_502 },
			{ "mcp4662-103", MCP466x_103 },
			{ "mcp4662-503", MCP466x_503 },
			{ "mcp4662-104", MCP466x_104 },
			{}
			};
			MODULE_DEVICE_TABLE(i2c, mcp4531_id);

	#ifdef CONFIG_OF		#ifdef CONFIG_OF

	#define MCP4531_COMPATIBLE(of_compatible, cfg) { \		#define MCP4531_COMPATIBLE(of_compatible, cfg) { \
	@@ -286,8 +355,7 @@ static const struct of_device_id mcp4531_of_match[] = {
	MODULE_DEVICE_TABLE(of, mcp4531_of_match);		MODULE_DEVICE_TABLE(of, mcp4531_of_match);
	#endif		#endif

	static int mcp4531_probe(struct i2c_client *client,		static int mcp4531_probe(struct i2c_client *client)
	const struct i2c_device_id *id)
	{		{
	struct device *dev = &client->dev;		struct device *dev = &client->dev;
	struct mcp4531_data *data;		struct mcp4531_data *data;
	@@ -311,7 +379,7 @@ static int mcp4531_probe(struct i2c_client *client,
	if (match)		if (match)
	data->cfg = of_device_get_match_data(dev);		data->cfg = of_device_get_match_data(dev);
	else		else
	data->cfg = &mcp4531_cfg[id->driver_data];		data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data];

	indio_dev->dev.parent = dev;		indio_dev->dev.parent = dev;
	indio_dev->info = &mcp4531_info;		indio_dev->info = &mcp4531_info;
	@@ -322,81 +390,12 @@ static int mcp4531_probe(struct i2c_client *client,
	return devm_iio_device_register(dev, indio_dev);		return devm_iio_device_register(dev, indio_dev);
	}		}

	static const struct i2c_device_id mcp4531_id[] = {
	{ "mcp4531-502", MCP453x_502 },
	{ "mcp4531-103", MCP453x_103 },
	{ "mcp4531-503", MCP453x_503 },
	{ "mcp4531-104", MCP453x_104 },
	{ "mcp4532-502", MCP453x_502 },
	{ "mcp4532-103", MCP453x_103 },
	{ "mcp4532-503", MCP453x_503 },
	{ "mcp4532-104", MCP453x_104 },
	{ "mcp4541-502", MCP454x_502 },
	{ "mcp4541-103", MCP454x_103 },
	{ "mcp4541-503", MCP454x_503 },
	{ "mcp4541-104", MCP454x_104 },
	{ "mcp4542-502", MCP454x_502 },
	{ "mcp4542-103", MCP454x_103 },
	{ "mcp4542-503", MCP454x_503 },
	{ "mcp4542-104", MCP454x_104 },
	{ "mcp4551-502", MCP455x_502 },
	{ "mcp4551-103", MCP455x_103 },
	{ "mcp4551-503", MCP455x_503 },
	{ "mcp4551-104", MCP455x_104 },
	{ "mcp4552-502", MCP455x_502 },
	{ "mcp4552-103", MCP455x_103 },
	{ "mcp4552-503", MCP455x_503 },
	{ "mcp4552-104", MCP455x_104 },
	{ "mcp4561-502", MCP456x_502 },
	{ "mcp4561-103", MCP456x_103 },
	{ "mcp4561-503", MCP456x_503 },
	{ "mcp4561-104", MCP456x_104 },
	{ "mcp4562-502", MCP456x_502 },
	{ "mcp4562-103", MCP456x_103 },
	{ "mcp4562-503", MCP456x_503 },
	{ "mcp4562-104", MCP456x_104 },
	{ "mcp4631-502", MCP463x_502 },
	{ "mcp4631-103", MCP463x_103 },
	{ "mcp4631-503", MCP463x_503 },
	{ "mcp4631-104", MCP463x_104 },
	{ "mcp4632-502", MCP463x_502 },
	{ "mcp4632-103", MCP463x_103 },
	{ "mcp4632-503", MCP463x_503 },
	{ "mcp4632-104", MCP463x_104 },
	{ "mcp4641-502", MCP464x_502 },
	{ "mcp4641-103", MCP464x_103 },
	{ "mcp4641-503", MCP464x_503 },
	{ "mcp4641-104", MCP464x_104 },
	{ "mcp4642-502", MCP464x_502 },
	{ "mcp4642-103", MCP464x_103 },
	{ "mcp4642-503", MCP464x_503 },
	{ "mcp4642-104", MCP464x_104 },
	{ "mcp4651-502", MCP465x_502 },
	{ "mcp4651-103", MCP465x_103 },
	{ "mcp4651-503", MCP465x_503 },
	{ "mcp4651-104", MCP465x_104 },
	{ "mcp4652-502", MCP465x_502 },
	{ "mcp4652-103", MCP465x_103 },
	{ "mcp4652-503", MCP465x_503 },
	{ "mcp4652-104", MCP465x_104 },
	{ "mcp4661-502", MCP466x_502 },
	{ "mcp4661-103", MCP466x_103 },
	{ "mcp4661-503", MCP466x_503 },
	{ "mcp4661-104", MCP466x_104 },
	{ "mcp4662-502", MCP466x_502 },
	{ "mcp4662-103", MCP466x_103 },
	{ "mcp4662-503", MCP466x_503 },
	{ "mcp4662-104", MCP466x_104 },
	{}
	};
	MODULE_DEVICE_TABLE(i2c, mcp4531_id);

	static struct i2c_driver mcp4531_driver = {		static struct i2c_driver mcp4531_driver = {
	.driver = {		.driver = {
	.name = "mcp4531",		.name = "mcp4531",
	.of_match_table = of_match_ptr(mcp4531_of_match),		.of_match_table = of_match_ptr(mcp4531_of_match),
	},		},
	.probe = mcp4531_probe,		.probe_new = mcp4531_probe,
	.id_table = mcp4531_id,		.id_table = mcp4531_id,
	};		};