OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regulator: lp8755: Convert to devm_request_threaded_irq
[uclinux-h8/linux.git]
/
drivers
/
regulator
/
lp8755.c
diff --git
a/drivers/regulator/lp8755.c
b/drivers/regulator/lp8755.c
index
4a415d4
..
d6773da
100644
(file)
--- a/
drivers/regulator/lp8755.c
+++ b/
drivers/regulator/lp8755.c
@@
-419,20
+419,16
@@
static int lp8755_int_config(struct lp8755_chip *pchip)
}
ret = lp8755_read(pchip, 0x0F, ®val);
}
ret = lp8755_read(pchip, 0x0F, ®val);
- if (ret < 0)
- goto err_i2c;
- pchip->irqmask = regval;
- ret = request_threaded_irq(pchip->irq, NULL, lp8755_irq_handler,
- IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- "lp8755-irq", pchip);
- if (ret)
+ if (ret < 0) {
+ dev_err(pchip->dev, "i2c acceess error %s\n", __func__);
return ret;
return ret;
+ }
-
return ret
;
-
-err_i2c:
- dev_err(pchip->dev, "i2c acceess error %s\n", __func__);
-
return ret
;
+
pchip->irqmask = regval
;
+ return devm_request_threaded_irq(pchip->dev, pchip->irq, NULL,
+ lp8755_irq_handler,
+ IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+
"lp8755-irq", pchip)
;
}
static const struct regmap_config lp8755_regmap = {
}
static const struct regmap_config lp8755_regmap = {
@@
-514,9
+510,6
@@
static int lp8755_remove(struct i2c_client *client)
for (icnt = 0; icnt < LP8755_BUCK_MAX; icnt++)
lp8755_write(pchip, icnt, 0x00);
for (icnt = 0; icnt < LP8755_BUCK_MAX; icnt++)
lp8755_write(pchip, icnt, 0x00);
- if (pchip->irq != 0)
- free_irq(pchip->irq, pchip);
-
return 0;
}
return 0;
}