Re: [PATCH v6 47/54] clk: mediatek: mt8192: Move apmixedsys clock driver to its own file

[AngeloGioacchino Del Regno]

Il 06/03/23 23:04, Daniel Golle ha scritto:
> On Mon, Mar 06, 2023 at 03:05:36PM +0100, AngeloGioacchino Del Regno wrote:
> > This is the last man standing in clk-mt8192.c that won't allow us to
> > use the module_platform_driver() macro, and for *no* good reason.
> > Move it to clk-mt8192-apmixedsys.c and while at it, also add a
> > .remove() callback for it.
> >
> > Also, since the need for "clk-mt8192-simple" and "clk-mt8192" was
> > just due to them being in the same file and probing different clocks,
> > and since now there's just one platform_driver struct per file, it
> > seemed natural to rename the `-simple` variant to just "clk-mt8192".
> >
> > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
> > Reviewed-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> > Tested-by: Miles Chen <miles.chen@xxxxxxxxxxxx>
> > Tested-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> > ---
> >   drivers/clk/mediatek/Makefile                |   2 +-
> >   drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 214 ++++++++++++++++++
> >   drivers/clk/mediatek/clk-mt8192.c            | 221 +------------------
> >   3 files changed, 219 insertions(+), 218 deletions(-)
> >   create mode 100644 drivers/clk/mediatek/clk-mt8192-apmixedsys.c
>
> I've tried to apply this on clk-next (currently v6.3-rc1) and also
> linux-next (next-20230306), on both this patch doesn't apply:
>
> Applying: clk: mediatek: mt8192: Move apmixedsys clock driver to its own file
> error: patch failed: drivers/clk/mediatek/clk-mt8192.c:12
> error: drivers/clk/mediatek/clk-mt8192.c: patch does not apply
> Patch failed at 0047 clk: mediatek: mt8192: Move apmixedsys clock driver to its own file
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".

You've missed the dependency that I've listed in the cover letter.

https://patchwork.kernel.org/project/linux-mediatek/list/?series=719067

Regards,
Angelo