Skip to content

Commit

Permalink
Merge tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Nov 26, 2019
2 parents 386403a + a20db58 commit 3b397c7
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/base/regmap/regmap-w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down

0 comments on commit 3b397c7

Please sign in to comment.