diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:10:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:10:05 -0800 |
| commit | 3b397c7ccafe0624018cb09fc96729f8f6165573 (patch) | |
| tree | d2c907ccd9014fccb7b66d62f42d1b40e74cfb7a | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (diff) | |
| parent | regmap: regmap-w1: Drop unreachable code (diff) | |
| download | linux-dev-3b397c7ccafe0624018cb09fc96729f8f6165573.tar.xz linux-dev-3b397c7ccafe0624018cb09fc96729f8f6165573.zip | |
Merge tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap update from Mark Brown:
"Just one patch for this release removing some dead code"
* tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: regmap-w1: Drop unreachable code
| -rw-r--r-- | drivers/base/regmap/regmap-w1.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c index 3a7d30b8c3ac..1fbaaad71ca5 100644 --- a/drivers/base/regmap/regmap-w1.c +++ b/drivers/base/regmap/regmap-w1.c @@ -215,8 +215,6 @@ struct regmap *__regmap_init_w1(struct device *w1_dev, return __regmap_init(w1_dev, bus, w1_dev, config, lock_key, lock_name); - - return NULL; } EXPORT_SYMBOL_GPL(__regmap_init_w1); @@ -233,8 +231,6 @@ struct regmap *__devm_regmap_init_w1(struct device *w1_dev, return __devm_regmap_init(w1_dev, bus, w1_dev, config, lock_key, lock_name); - - return NULL; } EXPORT_SYMBOL_GPL(__devm_regmap_init_w1); |