rapidio deadcoding
cover rapidio deadcoding
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This is a couple of rapidio deadcoding patches.
The first of these is a repost and was originally posted almost a year ago
https://lore.kernel.org/all/[email protected]/
but got no answer.
Other than being rebased and a typo fixed, it's not
changed.
Dave
Dr. David Alan Gilbert (2):
rapidio: remove some dead defines
rapidio: Remove unused functions
drivers/rapidio/devices/rio_mport_cdev.c | 20 ----- drivers/rapidio/rio.c | 103 ----------------------- drivers/rapidio/rio.h | 2 - drivers/rapidio/rio_cm.c | 6 -- include/linux/rio_drv.h | 5 -- 5 files changed, 136 deletions(-)
Signature · 1 line
2.49.0
PATCH 2/2 rapidio: Remove unused functions
From: "Dr. David Alan Gilbert" <[email protected]>
rio_request_dma() and rio_dma_prep_slave_sg() were added in 2012 by commit e42d98ebe7d7 ("rapidio: add DMA engine support for RIO data transfers")
but never used.
rio_find_mport() last use was removed in 2013 by
commit 9edbc30b434f ("rapidio: update enumerator registration mechanism")
rio_unregister_scan() was added in 2013 by
commit a11650e11093 ("rapidio: make enumeration/discovery configurable") but never used.
Remove them.
--- drivers/rapidio/rio.c | 103 ---------------------------------------- drivers/rapidio/rio.h | 2 - include/linux/rio_drv.h | 5 -- 3 files changed, 110 deletions(-)
drivers/rapidio/rio.c +0 -103
@@ -1774,19 +1774,6 @@ struct dma_chan *rio_request_mport_dma(struct rio_mport *mport) }EXPORT_SYMBOL_GPL (rio_request_mport_dma); -/** -* rio_request_dma - request RapidIO capable DMA channel that supports -* specified target RapidIO device. -* @rdev: RIO device associated with DMA transfer -* -* Returns pointer to allocated DMA channel or NULL if failed. -*/ -struct dma_chan *rio_request_dma (struct rio_dev *rdev) -{ -return rio_request_mport_dma (rdev->net->hport); -} -EXPORT_SYMBOL_GPL (rio_request_dma); -/** * rio_release_dma - release specified DMA channel * @dchan: DMA channel to release
@@ -1834,56 +1821,8 @@ struct dma_async_tx_descriptor *rio_dma_prep_xfer(struct dma_chan *dchan, }EXPORT_SYMBOL_GPL (rio_dma_prep_xfer); -/** -* rio_dma_prep_slave_sg - RapidIO specific wrapper -* for device_prep_slave_sg callback defined by DMAENGINE. -* @rdev: RIO device control structure -* @dchan: DMA channel to configure -* @data: RIO specific data descriptor -* @direction: DMA data transfer direction (TO or FROM the device) -* @flags: dmaengine defined flags -* -* Initializes RapidIO capable DMA channel for the specified data transfer. -* Uses DMA channel private extension to pass information related to remote -* target RIO device. -* -* Returns: pointer to DMA transaction descriptor if successful, -* error-valued pointer or NULL if failed. -*/ -struct dma_async_tx_descriptor *rio_dma_prep_slave_sg (struct rio_dev *rdev, -struct dma_chan *dchan,struct rio_dma_data *data, -enum dma_transfer_direction direction,unsigned long flags) -{ -return rio_dma_prep_xfer (dchan, rdev->destid, data, direction, flags); -} -EXPORT_SYMBOL_GPL (rio_dma_prep_slave_sg); -#endif /* CONFIG_RAPIDIO_DMA_ENGINE */ -/** -* rio_find_mport - find RIO mport by its ID -* @mport_id: number (ID) of mport device -* -* Given a RIO mport number, the desired mport is located -* in the global list of mports. If the mport is found, a pointer to its -* data structure is returned. If no mport is found, %NULL is returned. -*/ -struct rio_mport *rio_find_mport (int mport_id) -{ -struct rio_mport *port; - -mutex_lock (&rio_mport_list_lock); -list_for_each_entry (port, &rio_mports, node) { -if (port->id == mport_id) - goto found; - } - port =NULL ; -found: -mutex_unlock (&rio_mport_list_lock); - -return port; -} -/** * rio_register_scan - enumeration/discovery method registration interface * @mport_id: mport device ID for which fabric scan routine has to be set
@@ -1961,48 +1900,6 @@ int rio_register_scan(int mport_id, struct rio_scan *scan_ops) }EXPORT_SYMBOL_GPL (rio_register_scan); -/** -* rio_unregister_scan - removes enumeration/discovery method from mport -* @mport_id: mport device ID for which fabric scan routine has to be -* unregistered (RIO_MPORT_ANY = apply to all mports that use -* the specified scan_ops) -* @scan_ops: enumeration/discovery operations structure -* -* Removes enumeration or discovery method assigned to the specified mport -* device. If RIO_MPORT_ANY is specified, removes the specified operations from -* all mports that have them attached. -*/ -int rio_unregister_scan (int mport_id,struct rio_scan *scan_ops) -{ -struct rio_mport *port; -struct rio_scan_node *scan; - -pr_debug ("RIO: %s for mport_id=%d\n" , __func__, mport_id); - -if (mport_id !=RIO_MPORT_ANY && mport_id >=RIO_MAX_MPORTS ) -return -EINVAL ; - -mutex_lock (&rio_mport_list_lock); - -list_for_each_entry (port, &rio_mports, node) -if (port->id == mport_id || - (mport_id ==RIO_MPORT_ANY && port->nscan == scan_ops)) - port->nscan =NULL ; - -list_for_each_entry (scan, &rio_scans, node) { -if (scan->mport_id == mport_id) { -list_del (&scan->node); -kfree (scan); -break ; - } - } - -mutex_unlock (&rio_mport_list_lock); - -return 0 ; -} -EXPORT_SYMBOL_GPL (rio_unregister_scan); -/** * rio_mport_scan - execute enumeration/discovery on the specified mport * @mport_id: number (ID) of mport device
drivers/rapidio/rio.h +0 -2
@@ -41,9 +41,7 @@ extern void rio_del_device(struct rio_dev *rdev, enum rio_device_state state);extern int rio_enable_rx_tx_port (struct rio_mport *port,int local,u16 destid,u8 hopcount,u8 port_num);extern int rio_register_scan (int mport_id,struct rio_scan *scan_ops); -extern int rio_unregister_scan (int mport_id,struct rio_scan *scan_ops);extern void rio_attach_device (struct rio_dev *rdev); -extern struct rio_mport *rio_find_mport (int mport_id);extern int rio_mport_scan (int mport_id);/* Structures internal to the RIO core code */
include/linux/rio_drv.h +0 -5
@@ -391,13 +391,8 @@ struct rio_dev *rio_dev_get(struct rio_dev *);void rio_dev_put (struct rio_dev *);#ifdef CONFIG_RAPIDIO_DMA_ENGINE -extern struct dma_chan *rio_request_dma (struct rio_dev *rdev);extern struct dma_chan *rio_request_mport_dma (struct rio_mport *mport);extern void rio_release_dma (struct dma_chan *dchan); -extern struct dma_async_tx_descriptor *rio_dma_prep_slave_sg ( -struct rio_dev *rdev,struct dma_chan *dchan, -struct rio_dma_data *data, -enum dma_transfer_direction direction,unsigned long flags); extern struct dma_async_tx_descriptor *rio_dma_prep_xfer( struct dma_chan *dchan, u16 destid, struct rio_dma_data *data,
Signature · 1 line
2.49.0
PATCH 1/2 rapidio: remove some dead defines
In reply to [email protected]From: "Dr. David Alan Gilbert" <[email protected]>
'mport_dma_buf', 'rio_mport_dma_map' and 'MPORT_MAX_DMA_BUFS' were added in the original
commit e8de370188d0 ("rapidio: add mport char device driver") but never used.
'rio_cm_work' was unused since the original
commit b6e8d4aa1110 ("rapidio: add RapidIO channelized messaging driver")
but never used.
Remove them.
--- drivers/rapidio/devices/rio_mport_cdev.c | 20 -------------------- drivers/rapidio/rio_cm.c | 6 ------ 2 files changed, 26 deletions(-)
drivers/rapidio/devices/rio_mport_cdev.c +0 -20
@@ -97,18 +97,6 @@ module_param(dbg_level, uint, S_IWUSR | S_IWGRP | S_IRUGO);MODULE_PARM_DESC (dbg_level,"Debugging output level (default 0 = none)" );#endif -/* -* An internal DMA coherent buffer -*/ -struct mport_dma_buf { -void *ib_base; -dma_addr_t ib_phys; -u32 ib_size; -u64 ib_rio_base; -bool ib_map; -struct file *filp; -}; -/* * Internal memory mapping structure */
@@ -131,14 +119,6 @@ struct rio_mport_mapping {struct file *filp; }; -struct rio_mport_dma_map { -int valid; -u64 length; -void *vaddr; -dma_addr_t paddr; -}; - -#define MPORT_MAX_DMA_BUFS 16#define MPORT_EVENT_DEPTH 10/*
drivers/rapidio/rio_cm.c +0 -6
@@ -198,12 +198,6 @@ struct cm_peer {struct rio_dev *rdev; }; -struct rio_cm_work { -struct work_struct work; -struct cm_dev *cm; -void *data; -}; -struct conn_req {struct list_head node;u32 destid;/* requester destID */
Signature · 1 line
2.49.0