iio: sx9310: Change from .probe to .probe_new (9b2cac94) · Commits · 戴 / test

drivers/iio/proximity/sx9310.c

+14 −25

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ struct sx9310_data {
		struct completion completion;
		unsigned int chan_read, chan_event;
		int channel_users[SX9310_NUM_CHANNELS];
		int whoami;
		unsigned int whoami;
		};

		static const struct iio_event_spec sx9310_events[] = {
		@@ -856,24 +856,15 @@ static int sx9310_init_device(struct iio_dev *indio_dev)

		static int sx9310_set_indio_dev_name(struct device *dev,
		struct iio_dev *indio_dev,
		const struct i2c_device_id *id, int whoami)
		unsigned int whoami)
		{
		const struct acpi_device_id *acpi_id;

		/* id will be NULL when enumerated via ACPI */
		if (id) {
		if (id->driver_data != whoami)
		dev_err(dev, "WHOAMI does not match i2c_device_id: %s",
		id->name);
		} else if (ACPI_HANDLE(dev)) {
		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
		if (!acpi_id)
		return -ENODEV;
		if (acpi_id->driver_data != whoami)
		dev_err(dev, "WHOAMI does not match acpi_device_id: %s",
		acpi_id->id);
		} else
		unsigned int long ddata;

		ddata = (uintptr_t)device_get_match_data(dev);
		if (ddata != whoami) {
		dev_err(dev, "WHOAMI does not match device data: %u\n", whoami);
		return -ENODEV;
		}

		switch (whoami) {
		case SX9310_WHOAMI_VALUE:
		@@ -883,15 +874,14 @@ static int sx9310_set_indio_dev_name(struct device *dev,
		indio_dev->name = "sx9311";
		break;
		default:
		dev_err(dev, "unexpected WHOAMI response: %u", whoami);
		dev_err(dev, "unexpected WHOAMI response: %u\n", whoami);
		return -ENODEV;
		}

		return 0;
		}

		static int sx9310_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		static int sx9310_probe(struct i2c_client *client)
		{
		int ret;
		struct iio_dev *indio_dev;
		@@ -917,8 +907,7 @@ static int sx9310_probe(struct i2c_client *client,
		return ret;
		}

		ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, id,
		data->whoami);
		ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, data->whoami);
		if (ret < 0)
		return ret;

		@@ -1030,8 +1019,8 @@ static const struct acpi_device_id sx9310_acpi_match[] = {
		MODULE_DEVICE_TABLE(acpi, sx9310_acpi_match);

		static const struct of_device_id sx9310_of_match[] = {
		{ .compatible = "semtech,sx9310" },
		{ .compatible = "semtech,sx9311" },
		{ .compatible = "semtech,sx9310", (void *)SX9310_WHOAMI_VALUE },
		{ .compatible = "semtech,sx9311", (void *)SX9311_WHOAMI_VALUE },
		{},
		};
		MODULE_DEVICE_TABLE(of, sx9310_of_match);
		@@ -1050,7 +1039,7 @@ static struct i2c_driver sx9310_driver = {
		.of_match_table = sx9310_of_match,
		.pm = &sx9310_pm_ops,
		},
		.probe = sx9310_probe,
		.probe_new = sx9310_probe,
		.id_table = sx9310_id,
		};
		module_i2c_driver(sx9310_driver);

Admin message