diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-30 16:44:11 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 14:13:11 -0400 |
commit | f1b68d4ba40ab327a2aeec1e1fd667d9b9f5d777 (patch) | |
tree | 2a098c8c2737b72e450544348f707d92245b4911 | |
parent | fb8004d39bebfcc8b6b0a4263c712cee5b0f2a54 (diff) |
silicom: get_bypass_slave_pfs() open-codes lookup_port()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | drivers/staging/silicom/bp_mod.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/staging/silicom/bp_mod.c b/drivers/staging/silicom/bp_mod.c index 5392df316fb9..2c7334162c46 100644 --- a/drivers/staging/silicom/bp_mod.c +++ b/drivers/staging/silicom/bp_mod.c | |||
@@ -7436,33 +7436,10 @@ get_bypass_slave_pfs(char *page, char **start, off_t off, int count, | |||
7436 | bpctl_dev_t *pbp_device_block = (bpctl_dev_t *) data; | 7436 | bpctl_dev_t *pbp_device_block = (bpctl_dev_t *) data; |
7437 | 7437 | ||
7438 | int len = 0; | 7438 | int len = 0; |
7439 | bpctl_dev_t *pbp_device_block_slave = NULL; | 7439 | bpctl_dev_t *pbp_device_block_slave = get_status_port_fn(pbp_device_block); |
7440 | int idx_dev = 0; | ||
7441 | struct net_device *net_slave_dev = NULL; | 7440 | struct net_device *net_slave_dev = NULL; |
7442 | 7441 | ||
7443 | if ((pbp_device_block->func == 0) || (pbp_device_block->func == 2)) { | 7442 | if (!pbp_device_block_slave) |
7444 | for (idx_dev = 0; | ||
7445 | ((bpctl_dev_arr[idx_dev].pdev != NULL) | ||
7446 | && (idx_dev < device_num)); idx_dev++) { | ||
7447 | if ((bpctl_dev_arr[idx_dev].bus == | ||
7448 | pbp_device_block->bus) | ||
7449 | && (bpctl_dev_arr[idx_dev].slot == | ||
7450 | pbp_device_block->slot)) { | ||
7451 | if ((pbp_device_block->func == 0) | ||
7452 | && (bpctl_dev_arr[idx_dev].func == 1)) { | ||
7453 | pbp_device_block_slave = | ||
7454 | &bpctl_dev_arr[idx_dev]; | ||
7455 | break; | ||
7456 | } | ||
7457 | if ((pbp_device_block->func == 2) && | ||
7458 | (bpctl_dev_arr[idx_dev].func == 3)) { | ||
7459 | pbp_device_block_slave = | ||
7460 | &bpctl_dev_arr[idx_dev]; | ||
7461 | break; | ||
7462 | } | ||
7463 | } | ||
7464 | } | ||
7465 | } else | ||
7466 | pbp_device_block_slave = pbp_device_block; | 7443 | pbp_device_block_slave = pbp_device_block; |
7467 | if (!pbp_device_block_slave) { | 7444 | if (!pbp_device_block_slave) { |
7468 | len = sprintf(page, "fail\n"); | 7445 | len = sprintf(page, "fail\n"); |