UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: imu: adis16480: Use temporary variable for struct device 

Use temporary variable for struct device to make code neater.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Tested-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20220414131559.24694-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2022-04-14 16:15:58 +03:00 committed by Jonathan Cameron
parent 9eec6e510b
commit 79f4dc9dec
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/iio/imu/adis16480.c
View File

@ -1121,6 +1121,7 @@ static irqreturn_t adis16480_trigger_handler(int irq, void *p)
struct iio_dev *indio_dev = pf->indio_dev;
struct adis16480 *st = iio_priv(indio_dev);
struct adis *adis = &st->adis;
struct device *dev = &adis->spi->dev;
int ret, bit, offset, i = 0;
__be16 *buffer;
u32 crc;
@ -1132,7 +1133,7 @@ static irqreturn_t adis16480_trigger_handler(int irq, void *p)
adis->tx[1] = 0;
ret = spi_write(adis->spi, adis->tx, 2);
if (ret) {
dev_err(&adis->spi->dev, "Failed to change device page: %d\n", ret);
dev_err(dev, "Failed to change device page: %d\n", ret);
adis_dev_unlock(adis);
goto irq_done;
}
@ -1142,7 +1143,7 @@ static irqreturn_t adis16480_trigger_handler(int irq, void *p)
ret = spi_sync(adis->spi, &adis->msg);
if (ret) {
dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
dev_err(dev, "Failed to read data: %d\n", ret);
adis_dev_unlock(adis);
goto irq_done;
}
@ -1170,14 +1171,14 @@ static irqreturn_t adis16480_trigger_handler(int irq, void *p)
}
if (offset == 4) {
dev_err(&adis->spi->dev, "Invalid burst data\n");
dev_err(dev, "Invalid burst data\n");
goto irq_done;
}
crc = be16_to_cpu(buffer[offset + 16]) << 16 | be16_to_cpu(buffer[offset + 15]);
valid = adis16480_validate_crc((u16 *)&buffer[offset], 15, crc);
if (!valid) {
dev_err(&adis->spi->dev, "Invalid crc\n");
dev_err(dev, "Invalid crc\n");
goto irq_done;
}
@ -1216,12 +1217,12 @@ static const struct iio_info adis16480_info = {
static int adis16480_stop_device(struct iio_dev *indio_dev)
{
struct adis16480 *st = iio_priv(indio_dev);
struct device *dev = &st->adis.spi->dev;
int ret;
ret = adis_write_reg_16(&st->adis, ADIS16480_REG_SLP_CNT, BIT(9));
if (ret)
dev_err(&indio_dev->dev,
"Could not power down device: %d\n", ret);
dev_err(dev, "Could not power down device: %d\n", ret);
return ret;
}
@ -1253,7 +1254,7 @@ static int adis16480_config_irq_pin(struct adis16480 *st)
desc = irq_get_irq_data(st->adis.spi->irq);
if (!desc) {
dev_err(&st->adis.spi->dev, "Could not find IRQ %d\n", irq);
dev_err(dev, "Could not find IRQ %d\n", irq);
return -EINVAL;
}
@ -1290,8 +1291,7 @@ static int adis16480_config_irq_pin(struct adis16480 *st)
} else if (irq_type == IRQ_TYPE_EDGE_FALLING) {
val |= ADIS16480_DRDY_POL(0);
} else {
dev_err(&st->adis.spi->dev,
"Invalid interrupt type 0x%x specified\n", irq_type);
dev_err(dev, "Invalid interrupt type 0x%x specified\n", irq_type);
return -EINVAL;
}
/* Write the data ready configuration to the FNCTIO_CTRL register */
@ -1315,13 +1315,13 @@ static int adis16480_fw_get_ext_clk_pin(struct adis16480 *st)
}
clk_input_not_found:
dev_info(&st->adis.spi->dev,
"clk input line not specified, using DIO2\n");
dev_info(dev, "clk input line not specified, using DIO2\n");
return pin;
}
static int adis16480_ext_clk_config(struct adis16480 *st, bool enable)
{
struct device *dev = &st->adis.spi->dev;
unsigned int mode, mask;
enum adis16480_int_pin pin;
uint16_t val;
@ -1338,9 +1338,7 @@ static int adis16480_ext_clk_config(struct adis16480 *st, bool enable)
* automatically resets to zero (disabling the lower priority function).
*/
if (pin == ADIS16480_DRDY_SEL(val))
dev_warn(&st->adis.spi->dev,
"DIO%x pin supports only one function at a time\n",
pin + 1);
dev_warn(dev, "DIO%x pin supports only one function at a time\n", pin + 1);
mode = ADIS16480_SYNC_EN(enable) | ADIS16480_SYNC_SEL(pin);
mask = ADIS16480_SYNC_EN_MSK | ADIS16480_SYNC_SEL_MSK;
@ -1362,27 +1360,29 @@ static int adis16480_ext_clk_config(struct adis16480 *st, bool enable)
static int adis16480_get_ext_clocks(struct adis16480 *st)
{
struct device *dev = &st->adis.spi->dev;
st->clk_mode = ADIS16480_CLK_INT;
st->ext_clk = devm_clk_get(&st->adis.spi->dev, "sync");
st->ext_clk = devm_clk_get(dev, "sync");
if (!IS_ERR_OR_NULL(st->ext_clk)) {
st->clk_mode = ADIS16480_CLK_SYNC;
return 0;
}
if (PTR_ERR(st->ext_clk) != -ENOENT) {
dev_err(&st->adis.spi->dev, "failed to get ext clk\n");
dev_err(dev, "failed to get ext clk\n");
return PTR_ERR(st->ext_clk);
}
if (st->chip_info->has_pps_clk_mode) {
st->ext_clk = devm_clk_get(&st->adis.spi->dev, "pps");
st->ext_clk = devm_clk_get(dev, "pps");
if (!IS_ERR_OR_NULL(st->ext_clk)) {
st->clk_mode = ADIS16480_CLK_PPS;
return 0;
}
if (PTR_ERR(st->ext_clk) != -ENOENT) {
dev_err(&st->adis.spi->dev, "failed to get ext clk\n");
dev_err(dev, "failed to get ext clk\n");
return PTR_ERR(st->ext_clk);
}
}
@ -1405,11 +1405,12 @@ static int adis16480_probe(struct spi_device *spi)
const struct spi_device_id *id = spi_get_device_id(spi);
const struct adis_data *adis16480_data;
irq_handler_t trigger_handler = NULL;
struct device *dev = &spi->dev;
struct iio_dev *indio_dev;
struct adis16480 *st;
int ret;
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
if (indio_dev == NULL)
return -ENOMEM;
@ -1433,8 +1434,7 @@ static int adis16480_probe(struct spi_device *spi)
return ret;
if (st->chip_info->has_sleep_cnt) {
ret = devm_add_action_or_reset(&spi->dev, adis16480_stop,
indio_dev);
ret = devm_add_action_or_reset(dev, adis16480_stop, indio_dev);
if (ret)
return ret;
}
@ -1452,7 +1452,7 @@ static int adis16480_probe(struct spi_device *spi)
if (ret)
return ret;
ret = devm_add_action_or_reset(&spi->dev, adis16480_clk_disable, st->ext_clk);
ret = devm_add_action_or_reset(dev, adis16480_clk_disable, st->ext_clk);
if (ret)
return ret;
@ -1485,7 +1485,7 @@ static int adis16480_probe(struct spi_device *spi)
if (ret)
return ret;
ret = devm_iio_device_register(&spi->dev, indio_dev);
ret = devm_iio_device_register(dev, indio_dev);
if (ret)
return ret;