Merge tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

torvalds · torvalds · commit 3b397c7ccafe · 2019-11-25T21:10:05.000-08:00
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
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,6 @@ struct regmap __regmap_init_w1(struct device w1_dev,`
`215`	`215`
`216`	`216`	`return __regmap_init(w1_dev, bus, w1_dev, config,`
`217`	`217`	`lock_key, lock_name);`
`218`		`-`
`219`		`- return NULL;`
`220`	`218`	`}`
`221`	`219`	`EXPORT_SYMBOL_GPL(__regmap_init_w1);`
`222`	`220`
`@@ -233,8 +231,6 @@ struct regmap __devm_regmap_init_w1(struct device w1_dev,`
`233`	`231`
`234`	`232`	`return __devm_regmap_init(w1_dev, bus, w1_dev, config,`
`235`	`233`	`lock_key, lock_name);`
`236`		`-`
`237`		`- return NULL;`
`238`	`234`	`}`
`239`	`235`	`EXPORT_SYMBOL_GPL(__devm_regmap_init_w1);`
`240`	`236`