| Message ID | 20240709085131.1436128-1-nichen@iscas.ac.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: mediatek: mt8192: remove redundant null pointer check before of_node_put | expand |
Il 09/07/24 10:51, Chen Ni ha scritto: > of_node_put() has taken the null pointer check into account. So it is safe > to remove the duplicated check before of_node_put(). > > Signed-off-by: Chen Ni <nichen@iscas.ac.cn> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c > index 8b323fb19925..db00704e206d 100644 > --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c > +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c > @@ -1108,9 +1108,7 @@ static int mt8192_mt6359_legacy_probe(struct mtk_soc_card_data *soc_card_data) > err_headset_codec: > of_node_put(speaker_codec); > err_speaker_codec: > - if (hdmi_codec) > - of_node_put(hdmi_codec); > - > + of_node_put(hdmi_codec); > return ret; > } >
On Tue, 09 Jul 2024 16:51:31 +0800, Chen Ni wrote: > of_node_put() has taken the null pointer check into account. So it is safe > to remove the duplicated check before of_node_put(). > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: mediatek: mt8192: remove redundant null pointer check before of_node_put commit: 42eb47310f89eca3226e8e427bc9d571149dc866 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
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 8b323fb19925..db00704e206d 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -1108,9 +1108,7 @@ static int mt8192_mt6359_legacy_probe(struct mtk_soc_card_data *soc_card_data) err_headset_codec: of_node_put(speaker_codec); err_speaker_codec: - if (hdmi_codec) - of_node_put(hdmi_codec); - + of_node_put(hdmi_codec); return ret; }
of_node_put() has taken the null pointer check into account. So it is safe to remove the duplicated check before of_node_put(). Signed-off-by: Chen Ni <nichen@iscas.ac.cn> --- sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)