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

Commit a845a3aa authored by Beomho Seo's avatar Beomho Seo Committed by Jonathan Cameron
Browse files

iio: magnetometer: ak8975: Use devm_* APIs 



This patch use devm_* APIs make driver simpler.

Signed-off-by: default avatarBeomho Seo <beomho.seo@samsung.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent cfcd185e

drivers/iio/magnetometer/ak8975.c

+14 −44
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int ak8975_setup_irq(struct ak8975_data *data) 
	else

		irq = gpio_to_irq(data->eoc_gpio);



	rc = request_irq(irq, ak8975_irq_handler,

	rc = devm_request_irq(&client->dev, irq, ak8975_irq_handler,

			 IRQF_TRIGGER_RISING | IRQF_ONESHOT,

			 dev_name(&client->dev), data);

	if (rc < 0) {
@@ -520,21 +520,21 @@ static int ak8975_probe(struct i2c_client *client, 
	/* We may not have a GPIO based IRQ to scan, that is fine, we will

	   poll if so */

	if (gpio_is_valid(eoc_gpio)) {

		err = gpio_request_one(eoc_gpio, GPIOF_IN, "ak_8975");

		err = devm_gpio_request_one(&client->dev, eoc_gpio,

							GPIOF_IN, "ak_8975");

		if (err < 0) {

			dev_err(&client->dev,

				"failed to request GPIO %d, error %d\n",

							eoc_gpio, err);

			goto exit;

			return err;

		}

	}



	/* Register with IIO */

	indio_dev = iio_device_alloc(sizeof(*data));

	if (indio_dev == NULL) {

		err = -ENOMEM;

		goto exit_gpio;

	}

	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));

	if (indio_dev == NULL)

		return -ENOMEM;



	data = iio_priv(indio_dev);

	i2c_set_clientdata(client, indio_dev);
@@ -549,17 +549,16 @@ static int ak8975_probe(struct i2c_client *client, 
		name = (char *) id->name;

	} else if (ACPI_HANDLE(&client->dev))

		name = ak8975_match_acpi_device(&client->dev, &data->chipset);

	else {

		err = -ENOSYS;

		goto exit_free_iio;

	}

	else

		return -ENOSYS;



	dev_dbg(&client->dev, "Asahi compass chip %s\n", name);



	/* Perform some basic start-of-day setup of the device. */

	err = ak8975_setup(client);

	if (err < 0) {

		dev_err(&client->dev, "AK8975 initialization fails\n");

		goto exit_free_iio;

		return err;

	}



	data->client = client;
@@ -571,37 +570,9 @@ static int ak8975_probe(struct i2c_client *client, 
	indio_dev->info = &ak8975_info;

	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->name = name;

	err = iio_device_register(indio_dev);

	err = devm_iio_device_register(&client->dev, indio_dev);

	if (err < 0)

		goto exit_free_iio;



	return 0;



exit_free_iio:

	iio_device_free(indio_dev);

	if (data->eoc_irq)

		free_irq(data->eoc_irq, data);

exit_gpio:

	if (gpio_is_valid(eoc_gpio))

		gpio_free(eoc_gpio);

exit:

		return err;

}



static int ak8975_remove(struct i2c_client *client)

{

	struct iio_dev *indio_dev = i2c_get_clientdata(client);

	struct ak8975_data *data = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	if (data->eoc_irq)

		free_irq(data->eoc_irq, data);



	if (gpio_is_valid(data->eoc_gpio))

		gpio_free(data->eoc_gpio);



	iio_device_free(indio_dev);



	return 0;

}
@@ -628,7 +599,6 @@ static struct i2c_driver ak8975_driver = { 
		.acpi_match_table = ACPI_PTR(ak_acpi_match),

	},

	.probe		= ak8975_probe,

	.remove		= ak8975_remove,

	.id_table	= ak8975_id,

};

module_i2c_driver(ak8975_driver);