| Message ID | 20180301142027.GE30722@lenoch (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b3e9c3f0d98135d8b9991c2a34e42627c20664a4 |
| Headers | show |
On Thu, Mar 01, 2018 at 03:20:27PM +0100, Ladislav Michl wrote:
> Driver probe function has no use and can be deleted.
This doesn't apply against current code, please check and resend.
On Thu, Mar 01, 2018 at 05:56:54PM +0000, Mark Brown wrote: > On Thu, Mar 01, 2018 at 03:20:27PM +0100, Ladislav Michl wrote: > > Driver probe function has no use and can be deleted. > > This doesn't apply against current code, please check and resend. It was generated and tested against next-20180301. Which version do you want me to generate against? Based on 4.16-rc1 it'll fail to merge later. Thank you, ladis
On Thu, Mar 01, 2018 at 09:06:18PM +0100, Ladislav Michl wrote: > On Thu, Mar 01, 2018 at 05:56:54PM +0000, Mark Brown wrote: > > This doesn't apply against current code, please check and resend. > It was generated and tested against next-20180301. Which version do > you want me to generate against? Based on 4.16-rc1 it'll fail to > merge later. That is my current tree but I don't have a topic for this device other than your patches... please resend and I'll take a look what git didn't like.
On Thu, Mar 01, 2018 at 08:39:03PM +0000, Mark Brown wrote: > On Thu, Mar 01, 2018 at 09:06:18PM +0100, Ladislav Michl wrote: > > On Thu, Mar 01, 2018 at 05:56:54PM +0000, Mark Brown wrote: > > > > This doesn't apply against current code, please check and resend. > > > It was generated and tested against next-20180301. Which version do > > you want me to generate against? Based on 4.16-rc1 it'll fail to > > merge later. > > That is my current tree but I don't have a topic for this device other > than your patches... please resend and I'll take a look what git didn't > like. Well, in fact you have, but it is misnamed as topic/wm9867. So I guess once you merge these two topic branches, things will get fixed. Thank you, ladis
On Thu, Mar 01, 2018 at 10:32:43PM +0100, Ladislav Michl wrote: > On Thu, Mar 01, 2018 at 08:39:03PM +0000, Mark Brown wrote: > > On Thu, Mar 01, 2018 at 09:06:18PM +0100, Ladislav Michl wrote: > > > On Thu, Mar 01, 2018 at 05:56:54PM +0000, Mark Brown wrote: > > > > This doesn't apply against current code, please check and resend. > > > It was generated and tested against next-20180301. Which version do > > > you want me to generate against? Based on 4.16-rc1 it'll fail to > > > merge later. > > That is my current tree but I don't have a topic for this device other > > than your patches... please resend and I'll take a look what git didn't > > like. > Well, in fact you have, but it is misnamed as topic/wm9867. So I guess > once you merge these two topic branches, things will get fixed. Sorry, meant to reply here: as I said above, please resend.
diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 99b8035d2fda..3620b38291f0 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -406,17 +406,7 @@ static int max9867_resume(struct device *dev) } #endif -static int max9867_probe(struct snd_soc_component *component) -{ - struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); - - dev_dbg(component->dev, "max98090_probe\n"); - max9867->component = component; - return 0; -} - static const struct snd_soc_component_driver max9867_component = { - .probe = max9867_probe, .controls = max9867_snd_controls, .num_controls = ARRAY_SIZE(max9867_snd_controls), .dapm_routes = max9867_audio_map, diff --git a/sound/soc/codecs/max9867.h b/sound/soc/codecs/max9867.h index c0aea3d1f2ba..55cd9976ff47 100644 --- a/sound/soc/codecs/max9867.h +++ b/sound/soc/codecs/max9867.h @@ -75,7 +75,6 @@ /* codec private data */ struct max9867_priv { struct regmap *regmap; - struct snd_soc_component *component; unsigned int sysclk; unsigned int pclk; unsigned int master;
Driver probe function has no use and can be deleted. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- sound/soc/codecs/max9867.c | 10 ---------- sound/soc/codecs/max9867.h | 1 - 2 files changed, 11 deletions(-)