Commit 5c7b3280 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Linus Torvalds
Browse files

rapidio: remove unused rio_get_asm() and rio_get_device() 

The functions rio_get_asm() and rio_get_device() are globally exported
but have almost no users in tree. The only user is rio_init_mports()
which invokes it via rio_init().

rio_init() iterates over every registered device and invokes
rio_fixup_device().  It looks like a fixup function which should perform a
"change" to the device but does nothing.  It has been like this since its
introduction in commit 394b701c ("[PATCH] RapidIO support: core
base") which was merged into v2.6.15-rc1.

Remove rio_init() because the performed fixup function
(rio_fixup_device()) does nothing.  Remove rio_get_asm() and
rio_get_device() which have no callers now.

Link: https://lkml.kernel.org/r/20201116170004.420143-1-bigeasy@linutronix.de


Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca4a9241

drivers/rapidio/rio.c

+0 −81
Original line number Diff line number Diff line
@@ -1412,71 +1412,6 @@ rio_mport_get_feature(struct rio_mport * port, int local, u16 destid, 
}

EXPORT_SYMBOL_GPL(rio_mport_get_feature);



/**

 * rio_get_asm - Begin or continue searching for a RIO device by vid/did/asm_vid/asm_did

 * @vid: RIO vid to match or %RIO_ANY_ID to match all vids

 * @did: RIO did to match or %RIO_ANY_ID to match all dids

 * @asm_vid: RIO asm_vid to match or %RIO_ANY_ID to match all asm_vids

 * @asm_did: RIO asm_did to match or %RIO_ANY_ID to match all asm_dids

 * @from: Previous RIO device found in search, or %NULL for new search

 *

 * Iterates through the list of known RIO devices. If a RIO device is

 * found with a matching @vid, @did, @asm_vid, @asm_did, the reference

 * count to the device is incrememted and a pointer to its device

 * structure is returned. Otherwise, %NULL is returned. A new search

 * is initiated by passing %NULL to the @from argument. Otherwise, if

 * @from is not %NULL, searches continue from next device on the global

 * list. The reference count for @from is always decremented if it is

 * not %NULL.

 */

struct rio_dev *rio_get_asm(u16 vid, u16 did,

			    u16 asm_vid, u16 asm_did, struct rio_dev *from)

{

	struct list_head *n;

	struct rio_dev *rdev;



	WARN_ON(in_interrupt());

	spin_lock(&rio_global_list_lock);

	n = from ? from->global_list.next : rio_devices.next;



	while (n && (n != &rio_devices)) {

		rdev = rio_dev_g(n);

		if ((vid == RIO_ANY_ID || rdev->vid == vid) &&

		    (did == RIO_ANY_ID || rdev->did == did) &&

		    (asm_vid == RIO_ANY_ID || rdev->asm_vid == asm_vid) &&

		    (asm_did == RIO_ANY_ID || rdev->asm_did == asm_did))

			goto exit;

		n = n->next;

	}

	rdev = NULL;

      exit:

	rio_dev_put(from);

	rdev = rio_dev_get(rdev);

	spin_unlock(&rio_global_list_lock);

	return rdev;

}

EXPORT_SYMBOL_GPL(rio_get_asm);



/**

 * rio_get_device - Begin or continue searching for a RIO device by vid/did

 * @vid: RIO vid to match or %RIO_ANY_ID to match all vids

 * @did: RIO did to match or %RIO_ANY_ID to match all dids

 * @from: Previous RIO device found in search, or %NULL for new search

 *

 * Iterates through the list of known RIO devices. If a RIO device is

 * found with a matching @vid and @did, the reference count to the

 * device is incrememted and a pointer to its device structure is returned.

 * Otherwise, %NULL is returned. A new search is initiated by passing %NULL

 * to the @from argument. Otherwise, if @from is not %NULL, searches

 * continue from next device on the global list. The reference count for

 * @from is always decremented if it is not %NULL.

 */

struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from)

{

	return rio_get_asm(vid, did, RIO_ANY_ID, RIO_ANY_ID, from);

}

EXPORT_SYMBOL_GPL(rio_get_device);



/**

 * rio_std_route_add_entry - Add switch route table entry using standard

 *   registers defined in RIO specification rev.1.3
@@ -2106,20 +2041,6 @@ int rio_mport_scan(int mport_id) 
	return rc;

}



static void rio_fixup_device(struct rio_dev *dev)

{

}



static int rio_init(void)

{

	struct rio_dev *dev = NULL;



	while ((dev = rio_get_device(RIO_ANY_ID, RIO_ANY_ID, dev)) != NULL) {

		rio_fixup_device(dev);

	}

	return 0;

}



static struct workqueue_struct *rio_wq;



struct rio_disc_work {
@@ -2206,8 +2127,6 @@ int rio_init_mports(void) 
	kfree(work);



no_disc:

	rio_init();



	return 0;

}

EXPORT_SYMBOL_GPL(rio_init_mports);

include/linux/rio_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -444,9 +444,6 @@ static inline void rio_set_drvdata(struct rio_dev *rdev, void *data) 
/* Misc driver helpers */

extern u16 rio_local_get_device_id(struct rio_mport *port);

extern void rio_local_set_device_id(struct rio_mport *port, u16 did);

extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from);

extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did,

				   struct rio_dev *from);

extern int rio_init_mports(void);



#endif				/* LINUX_RIO_DRV_H */