Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0ead5c authored by Adriana Reus's avatar Adriana Reus Committed by Jonathan Cameron
Browse files

iio: Reconcile operation order between iio_register/unregister and pm functions 



At probe, runtime pm should be setup before registering the sysfs interface so
that all the power attributes are accurate and functional when registering.
Also, when removing the device we should unregister first to make sure
that the interfaces that may result in wakeups are no longer available.

Fix this behaviour for the following drivers: bmc150, bmg160, kmx61,
kxcj-1013, mma9551, mma9553, rpr0521.

Signed-off-by: default avatarAdriana Reus <adriana.reus@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 536bbca7

drivers/iio/accel/bmc150-accel-core.c

+9 −11
Original line number Diff line number Diff line
@@ -1623,24 +1623,22 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, 
		}

	}



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "Unable to register iio device\n");

		goto err_trigger_unregister;

	}



	ret = pm_runtime_set_active(dev);

	if (ret)

		goto err_iio_unregister;

		goto err_trigger_unregister;



	pm_runtime_enable(dev);

	pm_runtime_set_autosuspend_delay(dev, BMC150_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_use_autosuspend(dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "Unable to register iio device\n");

		goto err_trigger_unregister;

	}



	return 0;



err_iio_unregister:

	iio_device_unregister(indio_dev);

err_trigger_unregister:

	bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1);

err_buffer_cleanup:
@@ -1655,12 +1653,12 @@ int bmc150_accel_core_remove(struct device *dev) 
	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct bmc150_accel_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	pm_runtime_disable(data->dev);

	pm_runtime_set_suspended(data->dev);

	pm_runtime_put_noidle(data->dev);



	iio_device_unregister(indio_dev);



	bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1);



	iio_triggered_buffer_cleanup(indio_dev);

drivers/iio/accel/kxcjk-1013.c

+9 −11
Original line number Diff line number Diff line
@@ -1264,25 +1264,23 @@ static int kxcjk1013_probe(struct i2c_client *client, 
		goto err_trigger_unregister;

	}



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

	}



	ret = pm_runtime_set_active(&client->dev);

	if (ret)

		goto err_iio_unregister;

		goto err_buffer_cleanup;



	pm_runtime_enable(&client->dev);

	pm_runtime_set_autosuspend_delay(&client->dev,

					 KXCJK1013_SLEEP_DELAY_MS);

	pm_runtime_use_autosuspend(&client->dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

	}



	return 0;



err_iio_unregister:

	iio_device_unregister(indio_dev);

err_buffer_cleanup:

	if (data->dready_trig)

		iio_triggered_buffer_cleanup(indio_dev);
@@ -1302,12 +1300,12 @@ static int kxcjk1013_remove(struct i2c_client *client) 
	struct iio_dev *indio_dev = i2c_get_clientdata(client);

	struct kxcjk1013_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	pm_runtime_disable(&client->dev);

	pm_runtime_set_suspended(&client->dev);

	pm_runtime_put_noidle(&client->dev);



	iio_device_unregister(indio_dev);



	if (data->dready_trig) {

		iio_triggered_buffer_cleanup(indio_dev);

		iio_trigger_unregister(data->dready_trig);

drivers/iio/accel/mma9551.c

+9 −10
Original line number Diff line number Diff line
@@ -495,25 +495,23 @@ static int mma9551_probe(struct i2c_client *client, 
	if (ret < 0)

		goto out_poweroff;



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

	}



	ret = pm_runtime_set_active(&client->dev);

	if (ret < 0)

		goto out_iio_unregister;

		goto out_poweroff;



	pm_runtime_enable(&client->dev);

	pm_runtime_set_autosuspend_delay(&client->dev,

					 MMA9551_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_use_autosuspend(&client->dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

	}



	return 0;



out_iio_unregister:

	iio_device_unregister(indio_dev);

out_poweroff:

	mma9551_set_device_state(client, false);
@@ -525,11 +523,12 @@ static int mma9551_remove(struct i2c_client *client) 
	struct iio_dev *indio_dev = i2c_get_clientdata(client);

	struct mma9551_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	pm_runtime_disable(&client->dev);

	pm_runtime_set_suspended(&client->dev);

	pm_runtime_put_noidle(&client->dev);



	iio_device_unregister(indio_dev);

	mutex_lock(&data->mutex);

	mma9551_set_device_state(data->client, false);

	mutex_unlock(&data->mutex);

drivers/iio/accel/mma9553.c

+9 −11
Original line number Diff line number Diff line
@@ -1133,27 +1133,24 @@ static int mma9553_probe(struct i2c_client *client, 
		}

	}



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

	}



	ret = pm_runtime_set_active(&client->dev);

	if (ret < 0)

		goto out_iio_unregister;

		goto out_poweroff;



	pm_runtime_enable(&client->dev);

	pm_runtime_set_autosuspend_delay(&client->dev,

					 MMA9551_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_use_autosuspend(&client->dev);



	dev_dbg(&indio_dev->dev, "Registered device %s\n", name);

	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&client->dev, "unable to register iio device\n");

		goto out_poweroff;

	}



	dev_dbg(&indio_dev->dev, "Registered device %s\n", name);

	return 0;



out_iio_unregister:

	iio_device_unregister(indio_dev);

out_poweroff:

	mma9551_set_device_state(client, false);

	return ret;
@@ -1164,11 +1161,12 @@ static int mma9553_remove(struct i2c_client *client) 
	struct iio_dev *indio_dev = i2c_get_clientdata(client);

	struct mma9553_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	pm_runtime_disable(&client->dev);

	pm_runtime_set_suspended(&client->dev);

	pm_runtime_put_noidle(&client->dev);



	iio_device_unregister(indio_dev);

	mutex_lock(&data->mutex);

	mma9551_set_device_state(data->client, false);

	mutex_unlock(&data->mutex);

drivers/iio/gyro/bmg160_core.c

+9 −10
Original line number Diff line number Diff line
@@ -1077,25 +1077,23 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, 
		goto err_trigger_unregister;

	}



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

	}



	ret = pm_runtime_set_active(dev);

	if (ret)

		goto err_iio_unregister;

		goto err_buffer_cleanup;



	pm_runtime_enable(dev);

	pm_runtime_set_autosuspend_delay(dev,

					 BMG160_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_use_autosuspend(dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(dev, "unable to register iio device\n");

		goto err_buffer_cleanup;

	}



	return 0;



err_iio_unregister:

	iio_device_unregister(indio_dev);

err_buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

err_trigger_unregister:
@@ -1113,11 +1111,12 @@ void bmg160_core_remove(struct device *dev) 
	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct bmg160_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	pm_runtime_disable(dev);

	pm_runtime_set_suspended(dev);

	pm_runtime_put_noidle(dev);



	iio_device_unregister(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);



	if (data->dready_trig) {