| Message ID | TYCP286MB2323207367F2D39D0D725828CA189@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/6] hyperv: Make remove callback of hyperv driver void returned | expand |
On Mon, Dec 05, 2022 at 11:36:43PM +0800, Dawei Li wrote: > Since commit fc7a6209d571 ("bus: Make remove callback return > void") forces bus_type::remove be void-returned, it doesn't > make much sense for any bus based driver implementing remove > callbalk to return non-void to its caller. > > This change is for ac97 bus based drivers. > > Signed-off-by: Dawei Li <set_pte_at@outlook.com> > --- > drivers/mfd/wm97xx-core.c | 4 +--- > include/sound/ac97/codec.h | 6 +++--- > sound/ac97/bus.c | 5 ++--- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c > index 9a2331eb1bfa..663acbb1854c 100644 > --- a/drivers/mfd/wm97xx-core.c > +++ b/drivers/mfd/wm97xx-core.c > @@ -319,13 +319,11 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) > return ret; > } > > -static int wm97xx_ac97_remove(struct ac97_codec_device *adev) > +static void wm97xx_ac97_remove(struct ac97_codec_device *adev) > { > struct wm97xx_priv *wm97xx = ac97_get_drvdata(adev); > > snd_ac97_compat_release(wm97xx->ac97); > - > - return 0; > } > > static const struct ac97_id wm97xx_ac97_ids[] = { > diff --git a/include/sound/ac97/codec.h b/include/sound/ac97/codec.h > index 9792d25fa369..a26e9e0082f6 100644 > --- a/include/sound/ac97/codec.h > +++ b/include/sound/ac97/codec.h > @@ -62,9 +62,9 @@ struct ac97_codec_device { > */ > struct ac97_codec_driver { > struct device_driver driver; > - int (*probe)(struct ac97_codec_device *); > - int (*remove)(struct ac97_codec_device *); > - void (*shutdown)(struct ac97_codec_device *); > + int (*probe)(struct ac97_codec_device *dev); Why did you change this line? > + void (*remove)(struct ac97_codec_device *dev); > + void (*shutdown)(struct ac97_codec_device *dev); And this line? Don't change things that you don't describe in your changelog and that are not needed for your change. thanks, greg k-h
diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c index 9a2331eb1bfa..663acbb1854c 100644 --- a/drivers/mfd/wm97xx-core.c +++ b/drivers/mfd/wm97xx-core.c @@ -319,13 +319,11 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) return ret; } -static int wm97xx_ac97_remove(struct ac97_codec_device *adev) +static void wm97xx_ac97_remove(struct ac97_codec_device *adev) { struct wm97xx_priv *wm97xx = ac97_get_drvdata(adev); snd_ac97_compat_release(wm97xx->ac97); - - return 0; } static const struct ac97_id wm97xx_ac97_ids[] = { diff --git a/include/sound/ac97/codec.h b/include/sound/ac97/codec.h index 9792d25fa369..a26e9e0082f6 100644 --- a/include/sound/ac97/codec.h +++ b/include/sound/ac97/codec.h @@ -62,9 +62,9 @@ struct ac97_codec_device { */ struct ac97_codec_driver { struct device_driver driver; - int (*probe)(struct ac97_codec_device *); - int (*remove)(struct ac97_codec_device *); - void (*shutdown)(struct ac97_codec_device *); + int (*probe)(struct ac97_codec_device *dev); + void (*remove)(struct ac97_codec_device *dev); + void (*shutdown)(struct ac97_codec_device *dev); const struct ac97_id *id_table; }; diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 045330883a96..6067c04ce4c0 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -524,10 +524,9 @@ static void ac97_bus_remove(struct device *dev) if (ret < 0) return; - ret = adrv->remove(adev); + adrv->remove(adev); pm_runtime_put_noidle(dev); - if (ret == 0) - ac97_put_disable_clk(adev); + ac97_put_disable_clk(adev); pm_runtime_disable(dev); }
Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for ac97 bus based drivers. Signed-off-by: Dawei Li <set_pte_at@outlook.com> --- drivers/mfd/wm97xx-core.c | 4 +--- include/sound/ac97/codec.h | 6 +++--- sound/ac97/bus.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-)