* [PATCH 1/2] ASoC: cs42xx8: Move the code checking *regmap argument earlier @ 2015-06-25 13:41 Axel Lin 2015-06-25 13:44 ` [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table Axel Lin 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Move the code checking *regmap argument earlier" " Mark Brown 0 siblings, 2 replies; 5+ messages in thread From: Axel Lin @ 2015-06-25 13:41 UTC (permalink / raw) To: Mark Brown; +Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan Slightly improve the readability by moving the code checking *regmap argument earlier. Also move the assignment of of_id close to the place testing it. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- sound/soc/codecs/cs42xx8.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index e1d4686..ab39514 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -435,16 +435,24 @@ EXPORT_SYMBOL_GPL(cs42xx8_of_match); int cs42xx8_probe(struct device *dev, struct regmap *regmap) { - const struct of_device_id *of_id = of_match_device(cs42xx8_of_match, dev); + const struct of_device_id *of_id; struct cs42xx8_priv *cs42xx8; int ret, val, i; + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + dev_err(dev, "failed to allocate regmap: %d\n", ret); + return ret; + } + cs42xx8 = devm_kzalloc(dev, sizeof(*cs42xx8), GFP_KERNEL); if (cs42xx8 == NULL) return -ENOMEM; + cs42xx8->regmap = regmap; dev_set_drvdata(dev, cs42xx8); + of_id = of_match_device(cs42xx8_of_match, dev); if (of_id) cs42xx8->drvdata = of_id->data; @@ -482,13 +490,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) /* Make sure hardware reset done */ msleep(5); - cs42xx8->regmap = regmap; - if (IS_ERR(cs42xx8->regmap)) { - ret = PTR_ERR(cs42xx8->regmap); - dev_err(dev, "failed to allocate regmap: %d\n", ret); - goto err_enable; - } - /* * We haven't marked the chip revision as volatile due to * sharing a register with the right input volume; explicitly -- 2.1.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table 2015-06-25 13:41 [PATCH 1/2] ASoC: cs42xx8: Move the code checking *regmap argument earlier Axel Lin @ 2015-06-25 13:44 ` Axel Lin 2015-06-26 18:29 ` Brian Austin 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Setup of_match_table" to the asoc tree Mark Brown 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Move the code checking *regmap argument earlier" " Mark Brown 1 sibling, 2 replies; 5+ messages in thread From: Axel Lin @ 2015-06-25 13:44 UTC (permalink / raw) To: Mark Brown; +Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan Setup of_match_table and since cs42xx8_of_match is exported and used in cs42xx8-i2c.c, it cannot be static. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- sound/soc/codecs/cs42xx8-i2c.c | 3 ++- sound/soc/codecs/cs42xx8.c | 2 +- sound/soc/codecs/cs42xx8.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index 657dce2..5a71c9e 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -20,7 +20,7 @@ static int cs42xx8_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { - u32 ret = cs42xx8_probe(&i2c->dev, + int ret = cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config)); if (ret) return ret; @@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = { .name = "cs42xx8", .owner = THIS_MODULE, .pm = &cs42xx8_pm, + .of_match_table = cs42xx8_of_match, }, .probe = cs42xx8_i2c_probe, .remove = cs42xx8_i2c_remove, diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index ab39514..d562e1b 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = { }; EXPORT_SYMBOL_GPL(cs42888_data); -static const struct of_device_id cs42xx8_of_match[] = { +const struct of_device_id cs42xx8_of_match[] = { { .compatible = "cirrus,cs42448", .data = &cs42448_data, }, { .compatible = "cirrus,cs42888", .data = &cs42888_data, }, { /* sentinel */ } diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h index b2c10e5..d36c61b 100644 --- a/sound/soc/codecs/cs42xx8.h +++ b/sound/soc/codecs/cs42xx8.h @@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm; extern const struct cs42xx8_driver_data cs42448_data; extern const struct cs42xx8_driver_data cs42888_data; extern const struct regmap_config cs42xx8_regmap_config; +extern const struct of_device_id cs42xx8_of_match[]; int cs42xx8_probe(struct device *dev, struct regmap *regmap); /* CS42888 register map */ -- 2.1.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table 2015-06-25 13:44 ` [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table Axel Lin @ 2015-06-26 18:29 ` Brian Austin 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Setup of_match_table" to the asoc tree Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Brian Austin @ 2015-06-26 18:29 UTC (permalink / raw) To: Axel Lin Cc: alsa-devel, Brian Austin, Mark Brown, Liam Girdwood, Paul Handrigan On Thu, 25 Jun 2015, Axel Lin wrote: > Setup of_match_table and since cs42xx8_of_match is exported and used in > cs42xx8-i2c.c, it cannot be static. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> For Both. Thanks Axel, Acked-by: Brian Austin <brian.austin@cirrus.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Applied "ASoC: cs42xx8: Setup of_match_table" to the asoc tree 2015-06-25 13:44 ` [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table Axel Lin 2015-06-26 18:29 ` Brian Austin @ 2015-07-07 13:57 ` Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Mark Brown @ 2015-07-07 13:57 UTC (permalink / raw) To: Axel Lin, Brian Austin, Mark Brown; +Cc: alsa-devel The patch ASoC: cs42xx8: Setup of_match_table has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 5e4cb7b60833b0124a9f71dbc5118144ca79c3c4 Mon Sep 17 00:00:00 2001 From: Axel Lin <axel.lin@ingics.com> Date: Thu, 25 Jun 2015 21:44:13 +0800 Subject: [PATCH] ASoC: cs42xx8: Setup of_match_table Setup of_match_table and since cs42xx8_of_match is exported and used in cs42xx8-i2c.c, it cannot be static. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/cs42xx8-i2c.c | 3 ++- sound/soc/codecs/cs42xx8.c | 2 +- sound/soc/codecs/cs42xx8.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index 657dce2..5a71c9e 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -20,7 +20,7 @@ static int cs42xx8_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { - u32 ret = cs42xx8_probe(&i2c->dev, + int ret = cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config)); if (ret) return ret; @@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = { .name = "cs42xx8", .owner = THIS_MODULE, .pm = &cs42xx8_pm, + .of_match_table = cs42xx8_of_match, }, .probe = cs42xx8_i2c_probe, .remove = cs42xx8_i2c_remove, diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index ab39514..d562e1b 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = { }; EXPORT_SYMBOL_GPL(cs42888_data); -static const struct of_device_id cs42xx8_of_match[] = { +const struct of_device_id cs42xx8_of_match[] = { { .compatible = "cirrus,cs42448", .data = &cs42448_data, }, { .compatible = "cirrus,cs42888", .data = &cs42888_data, }, { /* sentinel */ } diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h index b2c10e5..d36c61b 100644 --- a/sound/soc/codecs/cs42xx8.h +++ b/sound/soc/codecs/cs42xx8.h @@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm; extern const struct cs42xx8_driver_data cs42448_data; extern const struct cs42xx8_driver_data cs42888_data; extern const struct regmap_config cs42xx8_regmap_config; +extern const struct of_device_id cs42xx8_of_match[]; int cs42xx8_probe(struct device *dev, struct regmap *regmap); /* CS42888 register map */ -- 2.1.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: cs42xx8: Move the code checking *regmap argument earlier" to the asoc tree 2015-06-25 13:41 [PATCH 1/2] ASoC: cs42xx8: Move the code checking *regmap argument earlier Axel Lin 2015-06-25 13:44 ` [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table Axel Lin @ 2015-07-07 13:57 ` Mark Brown 1 sibling, 0 replies; 5+ messages in thread From: Mark Brown @ 2015-07-07 13:57 UTC (permalink / raw) To: Axel Lin, Brian Austin, Mark Brown; +Cc: alsa-devel The patch ASoC: cs42xx8: Move the code checking *regmap argument earlier has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d375d0abcd625cd09cd90a252ad22a1085452e3c Mon Sep 17 00:00:00 2001 From: Axel Lin <axel.lin@ingics.com> Date: Thu, 25 Jun 2015 21:41:43 +0800 Subject: [PATCH] ASoC: cs42xx8: Move the code checking *regmap argument earlier Slightly improve the readability by moving the code checking *regmap argument earlier. Also move the assignment of of_id close to the place testing it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/cs42xx8.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index e1d4686..ab39514 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -435,16 +435,24 @@ EXPORT_SYMBOL_GPL(cs42xx8_of_match); int cs42xx8_probe(struct device *dev, struct regmap *regmap) { - const struct of_device_id *of_id = of_match_device(cs42xx8_of_match, dev); + const struct of_device_id *of_id; struct cs42xx8_priv *cs42xx8; int ret, val, i; + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + dev_err(dev, "failed to allocate regmap: %d\n", ret); + return ret; + } + cs42xx8 = devm_kzalloc(dev, sizeof(*cs42xx8), GFP_KERNEL); if (cs42xx8 == NULL) return -ENOMEM; + cs42xx8->regmap = regmap; dev_set_drvdata(dev, cs42xx8); + of_id = of_match_device(cs42xx8_of_match, dev); if (of_id) cs42xx8->drvdata = of_id->data; @@ -482,13 +490,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) /* Make sure hardware reset done */ msleep(5); - cs42xx8->regmap = regmap; - if (IS_ERR(cs42xx8->regmap)) { - ret = PTR_ERR(cs42xx8->regmap); - dev_err(dev, "failed to allocate regmap: %d\n", ret); - goto err_enable; - } - /* * We haven't marked the chip revision as volatile due to * sharing a register with the right input volume; explicitly -- 2.1.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-07 13:58 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-25 13:41 [PATCH 1/2] ASoC: cs42xx8: Move the code checking *regmap argument earlier Axel Lin 2015-06-25 13:44 ` [PATCH 2/2] ASoC: cs42xx8: Setup of_match_table Axel Lin 2015-06-26 18:29 ` Brian Austin 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Setup of_match_table" to the asoc tree Mark Brown 2015-07-07 13:57 ` Applied "ASoC: cs42xx8: Move the code checking *regmap argument earlier" " Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.