github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 10:41:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: magnetometer: ak8975: modernize polling loops with iopoll() macros

Browse Source 
The driver currently uses while loops and msleep() for polling during
conversion waits.

Replace the custom polling loops with readx_poll_timeout() and
read_poll_timeout() macros from <linux/iopoll.h>. This reduces
boilerplate, standardizes timeout handling and improves overall code
readability, keeping the original timing and error behaviour. Add
<linux/time.h> for USEC_PER_MSEC macro instead of using magic numbers.

Assisted-by: Gemini:3.1-Pro
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Joshua Crofts 2026-05-11 13:26:10 +02:00 committed by Jonathan Cameron
parent bdc573d5c3
commit cfa30b4330
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/iio/magnetometer/ak8975.c
View File

@ -24,6 +24,7 @@
#include <linux/pm_runtime.h>
#include <linux/property.h>
#include <linux/regulator/consumer.h>
#include <linux/time.h>
#include <linux/types.h>
#include <linux/wait.h>
@ -649,16 +650,14 @@ static int wait_conversion_complete_gpio(struct ak8975_data *data,
{
struct i2c_client *client = data->client;
int ret;
int val;
/* Wait for the conversion to complete. */
while (timeout_ms) {
msleep(poll_ms);
if (gpiod_get_value(data->eoc_gpiod))
break;
timeout_ms -= poll_ms;
}
if (!timeout_ms)
return -ETIMEDOUT;
ret = readx_poll_timeout(gpiod_get_value, data->eoc_gpiod, val, val != 0,
poll_ms * USEC_PER_MSEC,
timeout_ms * USEC_PER_MSEC);
if (ret)
return ret;
ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST1]);
if (ret < 0)
@ -672,27 +671,21 @@ static int wait_conversion_complete_polled(struct ak8975_data *data,
unsigned int timeout_ms)
{
struct i2c_client *client = data->client;
u8 read_status;
int ret;
int val;
/* Wait for the conversion to complete. */
while (timeout_ms) {
msleep(poll_ms);
ret = i2c_smbus_read_byte_data(client,
data->def->ctrl_regs[ST1]);
if (ret < 0) {
dev_err(&client->dev, "Error in reading ST1\n");
return ret;
}
read_status = ret;
if (read_status)
break;
timeout_ms -= poll_ms;
}
if (!timeout_ms)
return -ETIMEDOUT;
ret = read_poll_timeout(i2c_smbus_read_byte_data, val, val != 0,
poll_ms * USEC_PER_MSEC,
timeout_ms * USEC_PER_MSEC,
true,
client, data->def->ctrl_regs[ST1]);
if (ret)
return ret;
if (val < 0)
dev_err(&client->dev, "Error in reading ST1\n");
return read_status;
return val;
}
/* Returns 0 if the end of conversion interrupt occurred or -ETIMEDOUT otherwise */