Message ID | 20241115152055.279732-1-linux@treblig.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | bus: fsl-mc: Remove deadcode | expand |
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 >
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);