Skip to content

Commit

Permalink
bus: fsl-mc: Remove deadcode
Browse files Browse the repository at this point in the history
fsl_mc_allocator_driver_exit() was added explicitly by
commit 1e8ac83 ("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 197f4d6 ("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>
Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/20241115152055.279732-1-linux@treblig.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
  • Loading branch information
Dr. David Alan Gilbert authored and Christophe Leroy committed Mar 21, 2025
1 parent 586739b commit c25951e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 55 deletions.
22 changes: 0 additions & 22 deletions drivers/bus/fsl-mc/dpmcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
5 changes: 0 additions & 5 deletions drivers/bus/fsl-mc/fsl-mc-allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
6 changes: 0 additions & 6 deletions drivers/bus/fsl-mc/fsl-mc-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
Expand Down
20 changes: 0 additions & 20 deletions drivers/bus/fsl-mc/mc-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 0 additions & 2 deletions include/linux/fsl/mc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c25951e

Please sign in to comment.