mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-05 09:36:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_mio_common: Allow alternate board name for routes

Browse Source 
We do not have or do not provide routing information for all supported
boards.  Some of the boards for which we do not provide routing
information actually have routes that are identical to a similar board
for which we already provide routing information.

To allow boards to share identical routing information, add an
`alt_route_name` member to `struct ni_board_struct`.  This will be
initialized to `NULL` for all boards except those that will use make use
of the identical routing information that has been provided for a
similar board, in which case it will name that board.  Pass the
`alt_route_name` member value to `ni_assign_device_routes()` as the
`alt_board_name` parameter, which it will use if no routing information
could be found for the actual board name.

Cc: Éric Piel <piel@delmic.com>
Cc: Spencer E. Olson <olsonse@umich.edu>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20200207151400.272678-4-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott
2020-02-07 15:13:59 +00:00
committed by Greg Kroah-Hartman
parent e3b7ce73c5
commit 9bfd8bc5e8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@@ -5974,7 +5974,8 @@ static int ni_E_init(struct comedi_device *dev,
: "ni_eseries";
/* prepare the device for globally-named routes. */
if (ni_assign_device_routes(dev_family, board->name, NULL,
if (ni_assign_device_routes(dev_family, board->name,
board->alt_route_name,
&devpriv->routing_tables) < 0) {
dev_warn(dev->class_dev, "%s: %s device has no signal routing table.\n",
__func__, board->name);

1
drivers/staging/comedi/drivers/ni_stc.h
View File

@@ -941,6 +941,7 @@ enum ni_reg_type {
struct ni_board_struct {
const char *name;
const char *alt_route_name;
int device_id;
int isapnp_id;