Browse Source

silicom: get_bypass_slave_pfs() open-codes lookup_port()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 12 years ago
parent
commit
f1b68d4ba4
1 changed files with 2 additions and 25 deletions
  1. 2 25
      drivers/staging/silicom/bp_mod.c

+ 2 - 25
drivers/staging/silicom/bp_mod.c

@@ -7436,33 +7436,10 @@ get_bypass_slave_pfs(char *page, char **start, off_t off, int count,
 	bpctl_dev_t *pbp_device_block = (bpctl_dev_t *) data;
 
 	int len = 0;
-	bpctl_dev_t *pbp_device_block_slave = NULL;
-	int idx_dev = 0;
+	bpctl_dev_t *pbp_device_block_slave = get_status_port_fn(pbp_device_block);
 	struct net_device *net_slave_dev = NULL;
 
-	if ((pbp_device_block->func == 0) || (pbp_device_block->func == 2)) {
-		for (idx_dev = 0;
-		     ((bpctl_dev_arr[idx_dev].pdev != NULL)
-		      && (idx_dev < device_num)); idx_dev++) {
-			if ((bpctl_dev_arr[idx_dev].bus ==
-			     pbp_device_block->bus)
-			    && (bpctl_dev_arr[idx_dev].slot ==
-				pbp_device_block->slot)) {
-				if ((pbp_device_block->func == 0)
-				    && (bpctl_dev_arr[idx_dev].func == 1)) {
-					pbp_device_block_slave =
-					    &bpctl_dev_arr[idx_dev];
-					break;
-				}
-				if ((pbp_device_block->func == 2) &&
-				    (bpctl_dev_arr[idx_dev].func == 3)) {
-					pbp_device_block_slave =
-					    &bpctl_dev_arr[idx_dev];
-					break;
-				}
-			}
-		}
-	} else
+	if (!pbp_device_block_slave)
 		pbp_device_block_slave = pbp_device_block;
 	if (!pbp_device_block_slave) {
 		len = sprintf(page, "fail\n");