Message ID | 20241115152055.279732-1-linux@treblig.org (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Christophe Leroy |
Headers | show |
Series | bus: fsl-mc: Remove deadcode | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 5 jobs. |
snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 21 jobs. |
Le 15/11/2024 à 16:20, linux@treblig.org a écrit : > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > fsl_mc_allocator_driver_exit() was added explicitly by > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was added in 2015 by > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > drivers/bus/fsl-mc/dpmcp.c | 22 ---------------------- > drivers/bus/fsl-mc/fsl-mc-allocator.c | 5 ----- > drivers/bus/fsl-mc/fsl-mc-private.h | 6 ------ > drivers/bus/fsl-mc/mc-io.c | 20 -------------------- > include/linux/fsl/mc.h | 2 -- > 5 files changed, 55 deletions(-) > > diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c > index 5fbd0dbde24a..7816c0a728ef 100644 > --- a/drivers/bus/fsl-mc/dpmcp.c > +++ b/drivers/bus/fsl-mc/dpmcp.c > @@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > /* send command to mc*/ > return mc_send_command(mc_io, &cmd); > } > - > -/** > - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. > - * @mc_io: Pointer to MC portal's I/O object > - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' > - * @token: Token of DPMCP object > - * > - * Return: '0' on Success; Error code otherwise. > - */ > -int dpmcp_reset(struct fsl_mc_io *mc_io, > - u32 cmd_flags, > - u16 token) > -{ > - struct fsl_mc_command cmd = { 0 }; > - > - /* prepare command */ > - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, > - cmd_flags, token); > - > - /* send command to mc*/ > - return mc_send_command(mc_io, &cmd); > -} > diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c > index b5e8c021fa1f..6c3beb82dd1b 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c > +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c > @@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void) > { > return fsl_mc_driver_register(&fsl_mc_allocator_driver); > } > - > -void fsl_mc_allocator_driver_exit(void) > -{ > - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); > -} > diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h > index b3520ea1b9f4..e1b7ec3ed1a7 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-private.h > +++ b/drivers/bus/fsl-mc/fsl-mc-private.h > @@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > u32 cmd_flags, > u16 token); > > -int dpmcp_reset(struct fsl_mc_io *mc_io, > - u32 cmd_flags, > - u16 token); > - > /* > * Data Path Resource Container (DPRC) API > */ > @@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, > > int __init fsl_mc_allocator_driver_init(void); > > -void fsl_mc_allocator_driver_exit(void); > - > void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > > void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c > index 95b10a6cf307..a0ad7866cbfc 100644 > --- a/drivers/bus/fsl-mc/mc-io.c > +++ b/drivers/bus/fsl-mc/mc-io.c > @@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) > dpmcp_dev->consumer_link = NULL; > } > EXPORT_SYMBOL_GPL(fsl_mc_portal_free); > - > -/** > - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object > - * > - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free > - */ > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) > -{ > - int error; > - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; > - > - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); > - if (error < 0) { > - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); > - return error; > - } > - > - return 0; > -} > -EXPORT_SYMBOL_GPL(fsl_mc_portal_reset); > diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h > index c90ec889bfc2..37316a58d2ed 100644 > --- a/include/linux/fsl/mc.h > +++ b/include/linux/fsl/mc.h > @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, > > void fsl_mc_portal_free(struct fsl_mc_io *mc_io); > > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); > - > int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, > enum fsl_mc_pool_type pool_type, > struct fsl_mc_device **new_mc_adev); > -- > 2.47.0 >
* Christophe Leroy (christophe.leroy@csgroup.eu) wrote: > > > Le 15/11/2024 à 16:20, linux@treblig.org a écrit : > > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > > > fsl_mc_allocator_driver_exit() was added explicitly by > > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > > but was never used. > > > > Remove it. > > > > fsl_mc_portal_reset() was added in 2015 by > > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > > but was never used. > > > > Remove it. > > > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > > > Remove it. > > > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > > Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> Hi, Can someone pick this old change up please? I see the PPC patchwork says 'handled elsewhere' but doesn't say where. Thanks, Dave > > > --- > > drivers/bus/fsl-mc/dpmcp.c | 22 ---------------------- > > drivers/bus/fsl-mc/fsl-mc-allocator.c | 5 ----- > > drivers/bus/fsl-mc/fsl-mc-private.h | 6 ------ > > drivers/bus/fsl-mc/mc-io.c | 20 -------------------- > > include/linux/fsl/mc.h | 2 -- > > 5 files changed, 55 deletions(-) > > > > diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c > > index 5fbd0dbde24a..7816c0a728ef 100644 > > --- a/drivers/bus/fsl-mc/dpmcp.c > > +++ b/drivers/bus/fsl-mc/dpmcp.c > > @@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > > /* send command to mc*/ > > return mc_send_command(mc_io, &cmd); > > } > > - > > -/** > > - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. > > - * @mc_io: Pointer to MC portal's I/O object > > - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' > > - * @token: Token of DPMCP object > > - * > > - * Return: '0' on Success; Error code otherwise. > > - */ > > -int dpmcp_reset(struct fsl_mc_io *mc_io, > > - u32 cmd_flags, > > - u16 token) > > -{ > > - struct fsl_mc_command cmd = { 0 }; > > - > > - /* prepare command */ > > - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, > > - cmd_flags, token); > > - > > - /* send command to mc*/ > > - return mc_send_command(mc_io, &cmd); > > -} > > diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c > > index b5e8c021fa1f..6c3beb82dd1b 100644 > > --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c > > +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c > > @@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void) > > { > > return fsl_mc_driver_register(&fsl_mc_allocator_driver); > > } > > - > > -void fsl_mc_allocator_driver_exit(void) > > -{ > > - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); > > -} > > diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h > > index b3520ea1b9f4..e1b7ec3ed1a7 100644 > > --- a/drivers/bus/fsl-mc/fsl-mc-private.h > > +++ b/drivers/bus/fsl-mc/fsl-mc-private.h > > @@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > > u32 cmd_flags, > > u16 token); > > > > -int dpmcp_reset(struct fsl_mc_io *mc_io, > > - u32 cmd_flags, > > - u16 token); > > - > > /* > > * Data Path Resource Container (DPRC) API > > */ > > @@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, > > > > int __init fsl_mc_allocator_driver_init(void); > > > > -void fsl_mc_allocator_driver_exit(void); > > - > > void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > > > > void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > > diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c > > index 95b10a6cf307..a0ad7866cbfc 100644 > > --- a/drivers/bus/fsl-mc/mc-io.c > > +++ b/drivers/bus/fsl-mc/mc-io.c > > @@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) > > dpmcp_dev->consumer_link = NULL; > > } > > EXPORT_SYMBOL_GPL(fsl_mc_portal_free); > > - > > -/** > > - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object > > - * > > - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free > > - */ > > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) > > -{ > > - int error; > > - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; > > - > > - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); > > - if (error < 0) { > > - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); > > - return error; > > - } > > - > > - return 0; > > -} > > -EXPORT_SYMBOL_GPL(fsl_mc_portal_reset); > > diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h > > index c90ec889bfc2..37316a58d2ed 100644 > > --- a/include/linux/fsl/mc.h > > +++ b/include/linux/fsl/mc.h > > @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, > > > > void fsl_mc_portal_free(struct fsl_mc_io *mc_io); > > > > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); > > - > > int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, > > enum fsl_mc_pool_type pool_type, > > struct fsl_mc_device **new_mc_adev); > > -- > > 2.47.0 > > >
Le 13/03/2025 à 14:21, Dr. David Alan Gilbert a écrit : > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > * Christophe Leroy (christophe.leroy@csgroup.eu) wrote: >> >> >> Le 15/11/2024 à 16:20, linux@treblig.org a écrit : >>> [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] >>> >>> From: "Dr. David Alan Gilbert" <linux@treblig.org> >>> >>> fsl_mc_allocator_driver_exit() was added explicitly by >>> commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") >>> but was never used. >>> >>> Remove it. >>> >>> fsl_mc_portal_reset() was added in 2015 by >>> commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") >>> but was never used. >>> >>> Remove it. >>> >>> fsl_mc_portal_reset() was the only caller of dpmcp_reset(). >>> >>> Remove it. >>> >>> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> >> >> Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> > > Hi, > Can someone pick this old change up please? I see the PPC patchwork says > 'handled elsewhere' but doesn't say where. MAINTAINERS file says where: QORIQ DPAA2 FSL-MC BUS DRIVER M: Stuart Yoder <stuyoder@gmail.com> M: Laurentiu Tudor <laurentiu.tudor@nxp.com> L: linux-kernel@vger.kernel.org S: Maintained F: Documentation/ABI/stable/sysfs-bus-fsl-mc F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst F: drivers/bus/fsl-mc/ F: include/uapi/linux/fsl_mc.h FREESCALE SOC DRIVERS M: Christophe Leroy <christophe.leroy@csgroup.eu> L: linuxppc-dev@lists.ozlabs.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml F: Documentation/devicetree/bindings/soc/fsl/ F: drivers/soc/fsl/ F: include/linux/fsl/ F: include/soc/fsl/ I acked the 2 line changes in include/linux/fsl/mc.h, the main changes being in the C files which are not under my scope. Stuart, Laurentiu, can you pick up the patch ? Christophe > > Thanks, > > Dave >> >>> --- >>> drivers/bus/fsl-mc/dpmcp.c | 22 ---------------------- >>> drivers/bus/fsl-mc/fsl-mc-allocator.c | 5 ----- >>> drivers/bus/fsl-mc/fsl-mc-private.h | 6 ------ >>> drivers/bus/fsl-mc/mc-io.c | 20 -------------------- >>> include/linux/fsl/mc.h | 2 -- >>> 5 files changed, 55 deletions(-) >>> >>> diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c >>> index 5fbd0dbde24a..7816c0a728ef 100644 >>> --- a/drivers/bus/fsl-mc/dpmcp.c >>> +++ b/drivers/bus/fsl-mc/dpmcp.c >>> @@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io, >>> /* send command to mc*/ >>> return mc_send_command(mc_io, &cmd); >>> } >>> - >>> -/** >>> - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. >>> - * @mc_io: Pointer to MC portal's I/O object >>> - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' >>> - * @token: Token of DPMCP object >>> - * >>> - * Return: '0' on Success; Error code otherwise. >>> - */ >>> -int dpmcp_reset(struct fsl_mc_io *mc_io, >>> - u32 cmd_flags, >>> - u16 token) >>> -{ >>> - struct fsl_mc_command cmd = { 0 }; >>> - >>> - /* prepare command */ >>> - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, >>> - cmd_flags, token); >>> - >>> - /* send command to mc*/ >>> - return mc_send_command(mc_io, &cmd); >>> -} >>> diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c >>> index b5e8c021fa1f..6c3beb82dd1b 100644 >>> --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c >>> +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c >>> @@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void) >>> { >>> return fsl_mc_driver_register(&fsl_mc_allocator_driver); >>> } >>> - >>> -void fsl_mc_allocator_driver_exit(void) >>> -{ >>> - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); >>> -} >>> diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h >>> index b3520ea1b9f4..e1b7ec3ed1a7 100644 >>> --- a/drivers/bus/fsl-mc/fsl-mc-private.h >>> +++ b/drivers/bus/fsl-mc/fsl-mc-private.h >>> @@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io, >>> u32 cmd_flags, >>> u16 token); >>> >>> -int dpmcp_reset(struct fsl_mc_io *mc_io, >>> - u32 cmd_flags, >>> - u16 token); >>> - >>> /* >>> * Data Path Resource Container (DPRC) API >>> */ >>> @@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, >>> >>> int __init fsl_mc_allocator_driver_init(void); >>> >>> -void fsl_mc_allocator_driver_exit(void); >>> - >>> void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); >>> >>> void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); >>> diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c >>> index 95b10a6cf307..a0ad7866cbfc 100644 >>> --- a/drivers/bus/fsl-mc/mc-io.c >>> +++ b/drivers/bus/fsl-mc/mc-io.c >>> @@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) >>> dpmcp_dev->consumer_link = NULL; >>> } >>> EXPORT_SYMBOL_GPL(fsl_mc_portal_free); >>> - >>> -/** >>> - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object >>> - * >>> - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free >>> - */ >>> -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) >>> -{ >>> - int error; >>> - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; >>> - >>> - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); >>> - if (error < 0) { >>> - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); >>> - return error; >>> - } >>> - >>> - return 0; >>> -} >>> -EXPORT_SYMBOL_GPL(fsl_mc_portal_reset); >>> diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h >>> index c90ec889bfc2..37316a58d2ed 100644 >>> --- a/include/linux/fsl/mc.h >>> +++ b/include/linux/fsl/mc.h >>> @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, >>> >>> void fsl_mc_portal_free(struct fsl_mc_io *mc_io); >>> >>> -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); >>> - >>> int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, >>> enum fsl_mc_pool_type pool_type, >>> struct fsl_mc_device **new_mc_adev); >>> -- >>> 2.47.0 >>> >> > -- > -----Open up your eyes, open up your mind, open up your code ------- > / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ > \ dave @ treblig.org | | In Hex / > \ _________________________|_____ https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.treblig.org%2F&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7C707d35bccc9a4949428b08dd6231e98a%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C638774688697894005%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=ncMBG9AvSfn4mKmQkFv%2F6UfFYp%2FBMDOna7uejbavhUc%3D&reserved=0 |_______/
On Thu, Mar 13, 2025 at 02:37:56PM +0100, Christophe Leroy wrote: > > > Le 13/03/2025 à 14:21, Dr. David Alan Gilbert a écrit : > > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > * Christophe Leroy (christophe.leroy@csgroup.eu) wrote: > > > > > > > > > Le 15/11/2024 à 16:20, linux@treblig.org a écrit : > > > > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > > > > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > > > > > > > fsl_mc_allocator_driver_exit() was added explicitly by > > > > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > > > > but was never used. > > > > > > > > Remove it. > > > > > > > > fsl_mc_portal_reset() was added in 2015 by > > > > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > > > > but was never used. > > > > > > > > Remove it. > > > > > > > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > > > > > > > Remove it. > > > > > > > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > > > > > > Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> > > > > Hi, > > Can someone pick this old change up please? I see the PPC patchwork says > > 'handled elsewhere' but doesn't say where. > > MAINTAINERS file says where: > > QORIQ DPAA2 FSL-MC BUS DRIVER > M: Stuart Yoder <stuyoder@gmail.com> > M: Laurentiu Tudor <laurentiu.tudor@nxp.com> > L: linux-kernel@vger.kernel.org > S: Maintained > F: Documentation/ABI/stable/sysfs-bus-fsl-mc > F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt > F: > Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst > F: drivers/bus/fsl-mc/ > F: include/uapi/linux/fsl_mc.h > > FREESCALE SOC DRIVERS > M: Christophe Leroy <christophe.leroy@csgroup.eu> > L: linuxppc-dev@lists.ozlabs.org > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml > F: Documentation/devicetree/bindings/soc/fsl/ > F: drivers/soc/fsl/ > F: include/linux/fsl/ > F: include/soc/fsl/ > > I acked the 2 line changes in include/linux/fsl/mc.h, the main changes being > in the C files which are not under my scope. > > Stuart, Laurentiu, can you pick up the patch ? Stuart and Laurentiu are no longer at NXP. Even when they handled the fsl-mc bus driver, they didn't have a tree themselves to pick patches up but rather, historically, patches on the fsl-mc bus were picked by Greg KH. Ioana
Hi Greg, * Ioana Ciornei (ioana.ciornei@nxp.com) wrote: > On Thu, Mar 13, 2025 at 02:37:56PM +0100, Christophe Leroy wrote: > > > > > > Le 13/03/2025 à 14:21, Dr. David Alan Gilbert a écrit : > > > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > > > * Christophe Leroy (christophe.leroy@csgroup.eu) wrote: > > > > > > > > > > > > Le 15/11/2024 à 16:20, linux@treblig.org a écrit : > > > > > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > > > > > > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > > > > > > > > > fsl_mc_allocator_driver_exit() was added explicitly by > > > > > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > > > > > but was never used. > > > > > > > > > > Remove it. > > > > > > > > > > fsl_mc_portal_reset() was added in 2015 by > > > > > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > > > > > but was never used. > > > > > > > > > > Remove it. > > > > > > > > > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > > > > > > > > > Remove it. > > > > > > > > > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > > > > > > > > Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> > > > > > > Hi, > > > Can someone pick this old change up please? I see the PPC patchwork says > > > 'handled elsewhere' but doesn't say where. > > > > MAINTAINERS file says where: > > > > QORIQ DPAA2 FSL-MC BUS DRIVER > > M: Stuart Yoder <stuyoder@gmail.com> > > M: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > L: linux-kernel@vger.kernel.org > > S: Maintained > > F: Documentation/ABI/stable/sysfs-bus-fsl-mc > > F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt > > F: > > Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst > > F: drivers/bus/fsl-mc/ > > F: include/uapi/linux/fsl_mc.h > > > > FREESCALE SOC DRIVERS > > M: Christophe Leroy <christophe.leroy@csgroup.eu> > > L: linuxppc-dev@lists.ozlabs.org > > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > > S: Maintained > > F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml > > F: Documentation/devicetree/bindings/soc/fsl/ > > F: drivers/soc/fsl/ > > F: include/linux/fsl/ > > F: include/soc/fsl/ > > > > I acked the 2 line changes in include/linux/fsl/mc.h, the main changes being > > in the C files which are not under my scope. > > > > Stuart, Laurentiu, can you pick up the patch ? > > Stuart and Laurentiu are no longer at NXP. Even when they handled the > fsl-mc bus driver, they didn't have a tree themselves to pick patches up > but rather, historically, patches on the fsl-mc bus were picked by Greg > KH. OK, copied Greg in. Dave > Ioana
Ioana, Le 15/11/2024 à 16:20, linux@treblig.org a écrit : > [Vous ne recevez pas souvent de courriers de linux@treblig.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > fsl_mc_allocator_driver_exit() was added explicitly by > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was added in 2015 by > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Can you ack this patch ? Thanks Christophe > --- > drivers/bus/fsl-mc/dpmcp.c | 22 ---------------------- > drivers/bus/fsl-mc/fsl-mc-allocator.c | 5 ----- > drivers/bus/fsl-mc/fsl-mc-private.h | 6 ------ > drivers/bus/fsl-mc/mc-io.c | 20 -------------------- > include/linux/fsl/mc.h | 2 -- > 5 files changed, 55 deletions(-) > > diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c > index 5fbd0dbde24a..7816c0a728ef 100644 > --- a/drivers/bus/fsl-mc/dpmcp.c > +++ b/drivers/bus/fsl-mc/dpmcp.c > @@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > /* send command to mc*/ > return mc_send_command(mc_io, &cmd); > } > - > -/** > - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. > - * @mc_io: Pointer to MC portal's I/O object > - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' > - * @token: Token of DPMCP object > - * > - * Return: '0' on Success; Error code otherwise. > - */ > -int dpmcp_reset(struct fsl_mc_io *mc_io, > - u32 cmd_flags, > - u16 token) > -{ > - struct fsl_mc_command cmd = { 0 }; > - > - /* prepare command */ > - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, > - cmd_flags, token); > - > - /* send command to mc*/ > - return mc_send_command(mc_io, &cmd); > -} > diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c > index b5e8c021fa1f..6c3beb82dd1b 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c > +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c > @@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void) > { > return fsl_mc_driver_register(&fsl_mc_allocator_driver); > } > - > -void fsl_mc_allocator_driver_exit(void) > -{ > - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); > -} > diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h > index b3520ea1b9f4..e1b7ec3ed1a7 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-private.h > +++ b/drivers/bus/fsl-mc/fsl-mc-private.h > @@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io, > u32 cmd_flags, > u16 token); > > -int dpmcp_reset(struct fsl_mc_io *mc_io, > - u32 cmd_flags, > - u16 token); > - > /* > * Data Path Resource Container (DPRC) API > */ > @@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, > > int __init fsl_mc_allocator_driver_init(void); > > -void fsl_mc_allocator_driver_exit(void); > - > void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > > void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); > diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c > index 95b10a6cf307..a0ad7866cbfc 100644 > --- a/drivers/bus/fsl-mc/mc-io.c > +++ b/drivers/bus/fsl-mc/mc-io.c > @@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) > dpmcp_dev->consumer_link = NULL; > } > EXPORT_SYMBOL_GPL(fsl_mc_portal_free); > - > -/** > - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object > - * > - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free > - */ > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) > -{ > - int error; > - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; > - > - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); > - if (error < 0) { > - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); > - return error; > - } > - > - return 0; > -} > -EXPORT_SYMBOL_GPL(fsl_mc_portal_reset); > diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h > index c90ec889bfc2..37316a58d2ed 100644 > --- a/include/linux/fsl/mc.h > +++ b/include/linux/fsl/mc.h > @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, > > void fsl_mc_portal_free(struct fsl_mc_io *mc_io); > > -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); > - > int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, > enum fsl_mc_pool_type pool_type, > struct fsl_mc_device **new_mc_adev); > -- > 2.47.0 >
On Fri, Nov 15, 2024 at 03:20:55PM +0000, linux@treblig.org wrote: > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > fsl_mc_allocator_driver_exit() was added explicitly by > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was added in 2015 by > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was the only caller of dpmcp_reset(). > > Remove it. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Acked-by: Ioana Ciornei <ioana.ciornei@nxp.com>
On Fri, 15 Nov 2024 15:20:55 +0000, linux@treblig.org wrote: > fsl_mc_allocator_driver_exit() was added explicitly by > commit 1e8ac83b6caf ("bus: fsl-mc: add fsl_mc_allocator cleanup function") > but was never used. > > Remove it. > > fsl_mc_portal_reset() was added in 2015 by > commit 197f4d6a4a00 ("staging: fsl-mc: fsl-mc object allocator driver") > but was never used. > > [...] Applied, thanks! [1/1] bus: fsl-mc: Remove deadcode commit: c25951eb7518844fcb7fc9ec58e888731e8c46d0 Best regards,
diff --git a/drivers/bus/fsl-mc/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c index 5fbd0dbde24a..7816c0a728ef 100644 --- a/drivers/bus/fsl-mc/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io, /* send command to mc*/ return mc_send_command(mc_io, &cmd); } - -/** - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. - * @mc_io: Pointer to MC portal's I/O object - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' - * @token: Token of DPMCP object - * - * Return: '0' on Success; Error code otherwise. - */ -int dpmcp_reset(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token) -{ - struct fsl_mc_command cmd = { 0 }; - - /* prepare command */ - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, - cmd_flags, token); - - /* send command to mc*/ - return mc_send_command(mc_io, &cmd); -} diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c index b5e8c021fa1f..6c3beb82dd1b 100644 --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void) { return fsl_mc_driver_register(&fsl_mc_allocator_driver); } - -void fsl_mc_allocator_driver_exit(void) -{ - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); -} diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h index b3520ea1b9f4..e1b7ec3ed1a7 100644 --- a/drivers/bus/fsl-mc/fsl-mc-private.h +++ b/drivers/bus/fsl-mc/fsl-mc-private.h @@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token); -int dpmcp_reset(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token); - /* * Data Path Resource Container (DPRC) API */ @@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, int __init fsl_mc_allocator_driver_init(void); -void fsl_mc_allocator_driver_exit(void); - void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c index 95b10a6cf307..a0ad7866cbfc 100644 --- a/drivers/bus/fsl-mc/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) dpmcp_dev->consumer_link = NULL; } EXPORT_SYMBOL_GPL(fsl_mc_portal_free); - -/** - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object - * - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free - */ -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) -{ - int error; - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; - - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); - if (error < 0) { - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); - return error; - } - - return 0; -} -EXPORT_SYMBOL_GPL(fsl_mc_portal_reset); diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h index c90ec889bfc2..37316a58d2ed 100644 --- a/include/linux/fsl/mc.h +++ b/include/linux/fsl/mc.h @@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, void fsl_mc_portal_free(struct fsl_mc_io *mc_io); -int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); - int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, enum fsl_mc_pool_type pool_type, struct fsl_mc_device **new_mc_adev);