| Message ID | 20241219105447.889CB11FE@mail.steuer-voss.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | clk: clk-imx8mp-audiomix: fix function signature | expand |
On Thu, Dec 19, 2024 at 12:55 PM Nikolaus Voss <nv@vosn.de> wrote: > > clk_imx8mp_audiomix_reset_controller_register() in the > "if !CONFIG_RESET_CONTROLLER" branch had the first > argument missing. It is an empty function for this branch > so it wasn't immediately apparent. > > Fixes: 6f0e817175c5 ("clk: imx: clk-audiomix: Add reset controller") > Cc: <stable@vger.kernel.org> # 6.12.x > Signed-off-by: Nikolaus Voss <nv@vosn.de> Good catch. Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
On Thu, Dec 19, 2024 at 6:55 PM Nikolaus Voss <nv@vosn.de> wrote: > > clk_imx8mp_audiomix_reset_controller_register() in the > "if !CONFIG_RESET_CONTROLLER" branch had the first > argument missing. It is an empty function for this branch > so it wasn't immediately apparent. > > Fixes: 6f0e817175c5 ("clk: imx: clk-audiomix: Add reset controller") > Cc: <stable@vger.kernel.org> # 6.12.x > Signed-off-by: Nikolaus Voss <nv@vosn.de> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards Shengjiu Wang > --- > drivers/clk/imx/clk-imx8mp-audiomix.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c > index b2cb157703c57..c409fc7e06186 100644 > --- a/drivers/clk/imx/clk-imx8mp-audiomix.c > +++ b/drivers/clk/imx/clk-imx8mp-audiomix.c > @@ -278,7 +278,8 @@ static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, > > #else /* !CONFIG_RESET_CONTROLLER */ > > -static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv) > +static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, > + struct clk_imx8mp_audiomix_priv *priv) > { > return 0; > } > -- > 2.43.0 > >
On Thu, Dec 19, 2024 at 11:54:11AM +0100, Nikolaus Voss wrote: >clk_imx8mp_audiomix_reset_controller_register() in the >"if !CONFIG_RESET_CONTROLLER" branch had the first >argument missing. It is an empty function for this branch >so it wasn't immediately apparent. > >Fixes: 6f0e817175c5 ("clk: imx: clk-audiomix: Add reset controller") >Cc: <stable@vger.kernel.org> # 6.12.x >Signed-off-by: Nikolaus Voss <nv@vosn.de> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Quoting Nikolaus Voss (2024-12-19 02:54:11) > clk_imx8mp_audiomix_reset_controller_register() in the > "if !CONFIG_RESET_CONTROLLER" branch had the first > argument missing. It is an empty function for this branch > so it wasn't immediately apparent. > > Fixes: 6f0e817175c5 ("clk: imx: clk-audiomix: Add reset controller") > Cc: <stable@vger.kernel.org> # 6.12.x > Signed-off-by: Nikolaus Voss <nv@vosn.de> > --- Applied to clk-fixes
diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c index b2cb157703c57..c409fc7e06186 100644 --- a/drivers/clk/imx/clk-imx8mp-audiomix.c +++ b/drivers/clk/imx/clk-imx8mp-audiomix.c @@ -278,7 +278,8 @@ static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, #else /* !CONFIG_RESET_CONTROLLER */ -static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv) +static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, + struct clk_imx8mp_audiomix_priv *priv) { return 0; }
clk_imx8mp_audiomix_reset_controller_register() in the "if !CONFIG_RESET_CONTROLLER" branch had the first argument missing. It is an empty function for this branch so it wasn't immediately apparent. Fixes: 6f0e817175c5 ("clk: imx: clk-audiomix: Add reset controller") Cc: <stable@vger.kernel.org> # 6.12.x Signed-off-by: Nikolaus Voss <nv@vosn.de> --- drivers/clk/imx/clk-imx8mp-audiomix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)