Date:   Tue, 24 Jan 2023 23:16:29 +0800
From:   Dawei Li <set_pte_at@outlook.com>
To:     perex@perex.cz, tiwai@suse.com
Cc:     alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] ALSA: ac97: make remove callback of ac97 driver void
 returned
Message-ID: <TYCP286MB2323D4937533FE89ECFB615BCAC99@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM>
References: <TYCP286MB2323A5AB1B2578EF4FA15DA7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <TYCP286MB2323A5AB1B2578EF4FA15DA7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: TYCP286MB2323:EE_|OSZP286MB2288:EE_
X-MS-Office365-Filtering-Correlation-Id: dae22fc4-f956-4d2f-fa4a-08dafe1df966
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: LwwWcWq1uVLt4vQdfdvjoQ4pYC+uz6eH2oQzFKUflhDych+9gxVEWGOEBKFDhj9CcETCALRm3wGIhPWO38+mVTnI7IRkkfTgupU3H4e6PHUe49TWCZq8kurDU6TsulFTsWG9dyhxiOHLhKUDNi2mccIxx8MMGsyowZmWVdOp9i2m8F5S3HXRDa/UHQR8fTwp0aFeQu7Kp/ger1eWPEDmEBf4VhFVlYpZev00wedOKt/q3aPwj503apKUI1Vdhgm7zVSA9+VnmNKzr6R2Z5D+mzxpW0bfHihaLDcjqvMGOMLdM7M8uxG6Duqn3voUvHrOAfM8ATqICDbvRN5zVHC1PaZ6vebhKhO/zOXuY4Y1HgAOOZJZAeZ3g4avfIBsO4GOVRyCkwwqVhHlhgybd0Qn4IpS8TgwVB8FPNp12n/SmBj1ztBxOfPiThfPwncA52rVCiC2CRaBxhjC3M9xPT0M5sRE3xjsjpmPk3m23WdOFyUvhMRfmz/LjPPk/n8X/DnS4/cdDlFxLDIvytOUzEi/Re2IG2EMTRu1nfBhp1AilAqcD1UIX/1w/9+/K8MdoihD70aZTvzLb9L5X9RRJiYV3mpa/iHHnLR7QjeldpibgH/qdqQACiDBxgNiHieslqHczEK1Q/bhQa8uMZHhI9KU8g==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zuc3pg7oVjRTwwzL96SddQcRABeaN9evfpX+Sl9KuPU/tFF4cY9pWCUWGw0D?=
 =?us-ascii?Q?VgCJnqSx/3AI9HX/WY2Z73icqxk42JmsJWFEDcx38b0maAEWNDzpGSDp/6XS?=
 =?us-ascii?Q?fX51gdsaMf/B9ZnTWPi+pAxUoCN1e+DN8KGmAQSIjqjEytdwBGmXNNynmVor?=
 =?us-ascii?Q?74Kigs3K8bNO0PmuitebQwtrUVGBopk2OU68Jq0JSsYaG/adCrwCray+SeJy?=
 =?us-ascii?Q?kDqhpp3xfDMfsyrqnOEydi0m1/BvCKoec/eEo6qAhr9NCS1aOqX6gSXbVBxW?=
 =?us-ascii?Q?/OWOHyAyPsN9B1oUaMx33NHF76JS89uMAKfc8WrTkTr4qicGpy0P/Yx4EKSM?=
 =?us-ascii?Q?uTtmQxyddS/s/cRO+vDzUOmBSlx9vpSX0jYCfBxbvSVEBDLKQNPdPTzalCMg?=
 =?us-ascii?Q?oy+/qruldnDGRrtokPxs6ZuhylVgFOtq+NNEwK3L58MZceg0DBcDOIGxxGGc?=
 =?us-ascii?Q?+08gmKlhav0dV1HOTCRF96724azJtKVQpLS6WJYCs/qD0d1jnSnDIE3cKwcL?=
 =?us-ascii?Q?US2c74CgV8Mr433k+5mr0fFtj182RoBAq1DMue10JLAMd3AKVFifIyiPzaqi?=
 =?us-ascii?Q?QFASllQXLALUFtVqKQ5MuJqF8CaiyL9smZpjn1FXp/Pak001iYIHMgYAi2js?=
 =?us-ascii?Q?rEOY0xFWCPJmJsgN2Hz1i3YIiDTRXyQGu+jGDPxt95BNTwF8jZQ1XfcbzzOB?=
 =?us-ascii?Q?GwH6TyqVir8z4Ju+x/ThCSPdjYA59EvmgJnpNPlLu7GwfpkRn+cjEI0t93RY?=
 =?us-ascii?Q?dvAY5uL+mBY/8/Zey7nzTmRkspP/y1OVdIf7xkdJiqPY1M2nlFcsZ4QVLzx7?=
 =?us-ascii?Q?5B/wnfqR+Og5y7A6O/8LBDOkqabrYrv2dSkCwKC+JJdU5TFEN31gYG4FG5qx?=
 =?us-ascii?Q?2u1OYVj90wfq2K8WE9RtSRaDIw4EWxJO1lqSMgpaRmefdQuU44RCy2OIxOd1?=
 =?us-ascii?Q?433Hxwu2iYMPTGiS+abVft+QdpKt6GZd94wHVCKF7YfFK9PitvWJM+QVUrBU?=
 =?us-ascii?Q?a/VNdYLkiRVpjijGKaUMGuRIg9AwsnTl7PHarei/A9++u3Pmyj1RhAFDUppc?=
 =?us-ascii?Q?fISP3F9cmoLFHhk3RbNv3T+b2n4ZaBOLAgeTfot43dzCgWXESiyeat2URCEG?=
 =?us-ascii?Q?5aoHxG2Iw7o4bmSVJSZtO8PwCzgia73sD+0KWwrb8FG9yT/5HhWs1I1Pav4e?=
 =?us-ascii?Q?WAmYTXDojbOSJGLwWRDWYhE+LMp8Z4iBNruRvZd4dlK00l3cAt+wPekd0NzG?=
 =?us-ascii?Q?LJnRFauwdPdDGvduNhJo8AF8IDoJW7p0c1yXFvb14A=3D=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dae22fc4-f956-4d2f-fa4a-08dafe1df966
X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 15:16:32.2346
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB2288
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Jan 06, 2023 at 11:13:49PM +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.
> 
> As such, change the remove function for ac97 based drivers to return
> void.
> 
> Signed-off-by: Dawei Li <set_pte_at@outlook.com>

Gentle ping...

> ---
> v1 -> v2
> - Update commit message.
> - Rebased to latest sound/for-next.
> 
> v1
> - https://lore.kernel.org/all/TYCP286MB2323207367F2D39D0D725828CA189@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM/
> ---
>  drivers/mfd/wm97xx-core.c  | 4 +---
>  include/sound/ac97/codec.h | 2 +-
>  sound/ac97/bus.c           | 5 ++---
>  3 files changed, 4 insertions(+), 7 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..2fc641cb1982 100644
> --- a/include/sound/ac97/codec.h
> +++ b/include/sound/ac97/codec.h
> @@ -63,7 +63,7 @@ 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			(*remove)(struct ac97_codec_device *dev);
>  	void			(*shutdown)(struct ac97_codec_device *);
>  	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);
>  }
> -- 
> 2.25.1
>