Skip to content

L
linux
Commit efb39e4e authored by Chad Williamson's avatar Chad Williamson Committed by Greg Kroah-Hartman
Browse files
Options

Staging: silicom: remove the bpctl_dev_t typdef 

Replace the bpctl_dev_t typdef in bpctl_mod.c with struct bpctl_dev
for coding style compliance.
Signed-off-by: default avatarChad Williamson <chad@dahc.us>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64dcfe6b
Show whitespace changes
Inline Side-by-side
Showing with 276 additions and 276 deletions
drivers/staging/silicom/bpctl_mod.c
View file @ efb39e4e
...@@ -59,7 +59,7 @@ struct bypass_pfs_sd { ...@@ -59,7 +59,7 @@ struct bypass_pfs_sd {
struct proc_dir_entry *bypass_entry; struct proc_dir_entry *bypass_entry;
}; };
typedef struct _bpctl_dev { struct bpctl_dev {
char *name; char *name;
char *desc; char *desc;
struct pci_dev *pdev; /* PCI device */ struct pci_dev *pdev; /* PCI device */
...@@ -102,26 +102,26 @@ typedef struct _bpctl_dev { ...@@ -102,26 +102,26 @@ typedef struct _bpctl_dev {
char *bp_tx_data; char *bp_tx_data;
struct bypass_pfs_sd bypass_pfs_set; struct bypass_pfs_sd bypass_pfs_set;
} bpctl_dev_t; };
static bpctl_dev_t *bpctl_dev_arr; static struct bpctl_dev *bpctl_dev_arr;
static struct semaphore bpctl_sema; static struct semaphore bpctl_sema;
static int device_num; static int device_num;
static int get_dev_idx(int ifindex); static int get_dev_idx(int ifindex);
static bpctl_dev_t *get_master_port_fn(bpctl_dev_t *pbpctl_dev); static struct bpctl_dev *get_master_port_fn(struct bpctl_dev *pbpctl_dev);
static int disc_status(bpctl_dev_t *pbpctl_dev); static int disc_status(struct bpctl_dev *pbpctl_dev);
static int bypass_status(bpctl_dev_t *pbpctl_dev); static int bypass_status(struct bpctl_dev *pbpctl_dev);
static int wdt_timer(bpctl_dev_t *pbpctl_dev, int *time_left); static int wdt_timer(struct bpctl_dev *pbpctl_dev, int *time_left);
static bpctl_dev_t *get_status_port_fn(bpctl_dev_t *pbpctl_dev); static struct bpctl_dev *get_status_port_fn(struct bpctl_dev *pbpctl_dev);
static void if_scan_init(void); static void if_scan_init(void);
int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block); int bypass_proc_create_dev_sd(struct bpctl_dev *pbp_device_block);
int bypass_proc_remove_dev_sd(bpctl_dev_t *pbp_device_block); int bypass_proc_remove_dev_sd(struct bpctl_dev *pbp_device_block);
int bp_proc_create(void); int bp_proc_create(void);
int is_bypass_fn(bpctl_dev_t *pbpctl_dev); int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
int get_dev_idx_bsf(int bus, int slot, int func); int get_dev_idx_bsf(int bus, int slot, int func);
static unsigned long str_to_hex(char *p); static unsigned long str_to_hex(char *p);
...@@ -129,7 +129,7 @@ static int bp_device_event(struct notifier_block *unused, ...@@ -129,7 +129,7 @@ static int bp_device_event(struct notifier_block *unused,
unsigned long event, void *ptr) unsigned long event, void *ptr)
{ {
struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct net_device *dev = netdev_notifier_info_to_dev(ptr);
static bpctl_dev_t *pbpctl_dev, *pbpctl_dev_m; static struct bpctl_dev *pbpctl_dev, *pbpctl_dev_m;
int dev_num = 0, ret = 0, ret_d = 0, time_left = 0; int dev_num = 0, ret = 0, ret_d = 0, time_left = 0;
/* printk("BP_PROC_SUPPORT event =%d %s %d\n", event,dev->name, dev->ifindex ); */ /* printk("BP_PROC_SUPPORT event =%d %s %d\n", event,dev->name, dev->ifindex ); */
/* return NOTIFY_DONE; */ /* return NOTIFY_DONE; */
...@@ -284,17 +284,17 @@ static struct notifier_block bp_notifier_block = { ...@@ -284,17 +284,17 @@ static struct notifier_block bp_notifier_block = {
.notifier_call = bp_device_event, .notifier_call = bp_device_event,
}; };
int is_bypass_fn(bpctl_dev_t *pbpctl_dev); int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
int wdt_time_left(bpctl_dev_t *pbpctl_dev); int wdt_time_left(struct bpctl_dev *pbpctl_dev);
static void write_pulse(bpctl_dev_t *pbpctl_dev, static void write_pulse(struct bpctl_dev *pbpctl_dev,
unsigned int ctrl_ext, unsigned int ctrl_ext,
unsigned char value, unsigned char len) unsigned char value, unsigned char len)
{ {
unsigned char ctrl_val = 0; unsigned char ctrl_val = 0;
unsigned int i = len; unsigned int i = len;
unsigned int ctrl = 0; unsigned int ctrl = 0;
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
if (pbpctl_dev->bp_i80) if (pbpctl_dev->bp_i80)
ctrl = BPCTL_READ_REG(pbpctl_dev, CTRL_EXT); ctrl = BPCTL_READ_REG(pbpctl_dev, CTRL_EXT);
...@@ -590,13 +590,13 @@ static void write_pulse(bpctl_dev_t *pbpctl_dev, ...@@ -590,13 +590,13 @@ static void write_pulse(bpctl_dev_t *pbpctl_dev,
} }
} }
static int read_pulse(bpctl_dev_t *pbpctl_dev, unsigned int ctrl_ext, static int read_pulse(struct bpctl_dev *pbpctl_dev, unsigned int ctrl_ext,
unsigned char len) unsigned char len)
{ {
unsigned char ctrl_val = 0; unsigned char ctrl_val = 0;
unsigned int i = len; unsigned int i = len;
unsigned int ctrl = 0; unsigned int ctrl = 0;
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
if (pbpctl_dev->bp_i80) if (pbpctl_dev->bp_i80)
ctrl = BPCTL_READ_REG(pbpctl_dev, CTRL_EXT); ctrl = BPCTL_READ_REG(pbpctl_dev, CTRL_EXT);
...@@ -765,11 +765,11 @@ static int read_pulse(bpctl_dev_t *pbpctl_dev, unsigned int ctrl_ext, ...@@ -765,11 +765,11 @@ static int read_pulse(bpctl_dev_t *pbpctl_dev, unsigned int ctrl_ext,
return ctrl_val; return ctrl_val;
} }
static void write_reg(bpctl_dev_t *pbpctl_dev, unsigned char value, static void write_reg(struct bpctl_dev *pbpctl_dev, unsigned char value,
unsigned char addr) unsigned char addr)
{ {
uint32_t ctrl_ext = 0, ctrl = 0; uint32_t ctrl_ext = 0, ctrl = 0;
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
unsigned long flags; unsigned long flags;
if (pbpctl_dev->bp_10g9) { if (pbpctl_dev->bp_10g9) {
pbpctl_dev_c = get_status_port_fn(pbpctl_dev); pbpctl_dev_c = get_status_port_fn(pbpctl_dev);
...@@ -934,15 +934,15 @@ static void write_reg(bpctl_dev_t *pbpctl_dev, unsigned char value, ...@@ -934,15 +934,15 @@ static void write_reg(bpctl_dev_t *pbpctl_dev, unsigned char value,
} }
static void write_data(bpctl_dev_t *pbpctl_dev, unsigned char value) static void write_data(struct bpctl_dev *pbpctl_dev, unsigned char value)
{ {
write_reg(pbpctl_dev, value, CMND_REG_ADDR); write_reg(pbpctl_dev, value, CMND_REG_ADDR);
} }
static int read_reg(bpctl_dev_t *pbpctl_dev, unsigned char addr) static int read_reg(struct bpctl_dev *pbpctl_dev, unsigned char addr)
{ {
uint32_t ctrl_ext = 0, ctrl = 0, ctrl_value = 0; uint32_t ctrl_ext = 0, ctrl = 0, ctrl_value = 0;
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
#ifdef BP_SYNC_FLAG #ifdef BP_SYNC_FLAG
unsigned long flags; unsigned long flags;
...@@ -1208,10 +1208,10 @@ static int read_reg(bpctl_dev_t *pbpctl_dev, unsigned char addr) ...@@ -1208,10 +1208,10 @@ static int read_reg(bpctl_dev_t *pbpctl_dev, unsigned char addr)
return ctrl_value; return ctrl_value;
} }
static int wdt_pulse(bpctl_dev_t *pbpctl_dev) static int wdt_pulse(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0, ctrl = 0; uint32_t ctrl_ext = 0, ctrl = 0;
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
#ifdef BP_SYNC_FLAG #ifdef BP_SYNC_FLAG
unsigned long flags; unsigned long flags;
...@@ -1424,7 +1424,7 @@ static int wdt_pulse(bpctl_dev_t *pbpctl_dev) ...@@ -1424,7 +1424,7 @@ static int wdt_pulse(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
static void data_pulse(bpctl_dev_t *pbpctl_dev, unsigned char value) static void data_pulse(struct bpctl_dev *pbpctl_dev, unsigned char value)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1490,7 +1490,7 @@ static void data_pulse(bpctl_dev_t *pbpctl_dev, unsigned char value) ...@@ -1490,7 +1490,7 @@ static void data_pulse(bpctl_dev_t *pbpctl_dev, unsigned char value)
} }
static int send_wdt_pulse(bpctl_dev_t *pbpctl_dev) static int send_wdt_pulse(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1524,7 +1524,7 @@ static int send_wdt_pulse(bpctl_dev_t *pbpctl_dev) ...@@ -1524,7 +1524,7 @@ static int send_wdt_pulse(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
void send_bypass_clear_pulse(bpctl_dev_t *pbpctl_dev, unsigned int value) void send_bypass_clear_pulse(struct bpctl_dev *pbpctl_dev, unsigned int value)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1550,7 +1550,7 @@ void send_bypass_clear_pulse(bpctl_dev_t *pbpctl_dev, unsigned int value) ...@@ -1550,7 +1550,7 @@ void send_bypass_clear_pulse(bpctl_dev_t *pbpctl_dev, unsigned int value)
/* #endif OLD_FW */ /* #endif OLD_FW */
#ifdef BYPASS_DEBUG #ifdef BYPASS_DEBUG
int pulse_set_fn(bpctl_dev_t *pbpctl_dev, unsigned int counter) int pulse_set_fn(struct bpctl_dev *pbpctl_dev, unsigned int counter)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1578,7 +1578,7 @@ int pulse_set_fn(bpctl_dev_t *pbpctl_dev, unsigned int counter) ...@@ -1578,7 +1578,7 @@ int pulse_set_fn(bpctl_dev_t *pbpctl_dev, unsigned int counter)
return 0; return 0;
} }
int zero_set_fn(bpctl_dev_t *pbpctl_dev) int zero_set_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0, ctrl_value = 0; uint32_t ctrl_ext = 0, ctrl_value = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -1603,7 +1603,7 @@ int zero_set_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1603,7 +1603,7 @@ int zero_set_fn(bpctl_dev_t *pbpctl_dev)
return ctrl_value; return ctrl_value;
} }
int pulse_get2_fn(bpctl_dev_t *pbpctl_dev) int pulse_get2_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0, ctrl_value = 0; uint32_t ctrl_ext = 0, ctrl_value = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -1618,7 +1618,7 @@ int pulse_get2_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1618,7 +1618,7 @@ int pulse_get2_fn(bpctl_dev_t *pbpctl_dev)
return ctrl_value; return ctrl_value;
} }
int pulse_get1_fn(bpctl_dev_t *pbpctl_dev) int pulse_get1_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0, ctrl_value = 0; uint32_t ctrl_ext = 0, ctrl_value = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -1635,7 +1635,7 @@ int pulse_get1_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1635,7 +1635,7 @@ int pulse_get1_fn(bpctl_dev_t *pbpctl_dev)
return ctrl_value; return ctrl_value;
} }
int gpio6_set_fn(bpctl_dev_t *pbpctl_dev) int gpio6_set_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1646,7 +1646,7 @@ int gpio6_set_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1646,7 +1646,7 @@ int gpio6_set_fn(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
int gpio7_set_fn(bpctl_dev_t *pbpctl_dev) int gpio7_set_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1657,7 +1657,7 @@ int gpio7_set_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1657,7 +1657,7 @@ int gpio7_set_fn(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
int gpio7_clear_fn(bpctl_dev_t *pbpctl_dev) int gpio7_clear_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1668,7 +1668,7 @@ int gpio7_clear_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1668,7 +1668,7 @@ int gpio7_clear_fn(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
int gpio6_clear_fn(bpctl_dev_t *pbpctl_dev) int gpio6_clear_fn(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
...@@ -1680,9 +1680,9 @@ int gpio6_clear_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1680,9 +1680,9 @@ int gpio6_clear_fn(bpctl_dev_t *pbpctl_dev)
} }
#endif /*BYPASS_DEBUG */ #endif /*BYPASS_DEBUG */
static bpctl_dev_t *lookup_port(bpctl_dev_t *dev) static struct bpctl_dev *lookup_port(struct bpctl_dev *dev)
{ {
bpctl_dev_t *p; struct bpctl_dev *p;
int n; int n;
for (n = 0, p = bpctl_dev_arr; n < device_num && p->pdev; n++) { for (n = 0, p = bpctl_dev_arr; n < device_num && p->pdev; n++) {
if (p->bus == dev->bus if (p->bus == dev->bus
...@@ -1693,7 +1693,7 @@ static bpctl_dev_t *lookup_port(bpctl_dev_t *dev) ...@@ -1693,7 +1693,7 @@ static bpctl_dev_t *lookup_port(bpctl_dev_t *dev)
return NULL; return NULL;
} }
static bpctl_dev_t *get_status_port_fn(bpctl_dev_t *pbpctl_dev) static struct bpctl_dev *get_status_port_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev) { if (pbpctl_dev) {
if (pbpctl_dev->func == 0 || pbpctl_dev->func == 2) if (pbpctl_dev->func == 0 || pbpctl_dev->func == 2)
...@@ -1702,7 +1702,7 @@ static bpctl_dev_t *get_status_port_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1702,7 +1702,7 @@ static bpctl_dev_t *get_status_port_fn(bpctl_dev_t *pbpctl_dev)
return NULL; return NULL;
} }
static bpctl_dev_t *get_master_port_fn(bpctl_dev_t *pbpctl_dev) static struct bpctl_dev *get_master_port_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev) { if (pbpctl_dev) {
if (pbpctl_dev->func == 1 || pbpctl_dev->func == 3) if (pbpctl_dev->func == 1 || pbpctl_dev->func == 3)
...@@ -1715,7 +1715,7 @@ static bpctl_dev_t *get_master_port_fn(bpctl_dev_t *pbpctl_dev) ...@@ -1715,7 +1715,7 @@ static bpctl_dev_t *get_master_port_fn(bpctl_dev_t *pbpctl_dev)
/**************INTEL API***************/ /**************INTEL API***************/
/**************************************/ /**************************************/
static void write_data_port_int(bpctl_dev_t *pbpctl_dev, static void write_data_port_int(struct bpctl_dev *pbpctl_dev,
unsigned char ctrl_value) unsigned char ctrl_value)
{ {
uint32_t value; uint32_t value;
...@@ -1740,9 +1740,9 @@ static void write_data_port_int(bpctl_dev_t *pbpctl_dev, ...@@ -1740,9 +1740,9 @@ static void write_data_port_int(bpctl_dev_t *pbpctl_dev,
} }
static int write_data_int(bpctl_dev_t *pbpctl_dev, unsigned char value) static int write_data_int(struct bpctl_dev *pbpctl_dev, unsigned char value)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -1755,7 +1755,7 @@ static int write_data_int(bpctl_dev_t *pbpctl_dev, unsigned char value) ...@@ -1755,7 +1755,7 @@ static int write_data_int(bpctl_dev_t *pbpctl_dev, unsigned char value)
return 0; return 0;
} }
static int wdt_pulse_int(bpctl_dev_t *pbpctl_dev) static int wdt_pulse_int(struct bpctl_dev *pbpctl_dev)
{ {
if ((atomic_read(&pbpctl_dev->wdt_busy)) == 1) if ((atomic_read(&pbpctl_dev->wdt_busy)) == 1)
...@@ -1779,7 +1779,7 @@ static int wdt_pulse_int(bpctl_dev_t *pbpctl_dev) ...@@ -1779,7 +1779,7 @@ static int wdt_pulse_int(bpctl_dev_t *pbpctl_dev)
/*************************************/ /*************************************/
/* CMND_ON 0x4 (100)*/ /* CMND_ON 0x4 (100)*/
int cmnd_on(bpctl_dev_t *pbpctl_dev) int cmnd_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -1796,7 +1796,7 @@ int cmnd_on(bpctl_dev_t *pbpctl_dev) ...@@ -1796,7 +1796,7 @@ int cmnd_on(bpctl_dev_t *pbpctl_dev)
} }
/* CMND_OFF 0x2 (10)*/ /* CMND_OFF 0x2 (10)*/
int cmnd_off(bpctl_dev_t *pbpctl_dev) int cmnd_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -1814,7 +1814,7 @@ int cmnd_off(bpctl_dev_t *pbpctl_dev) ...@@ -1814,7 +1814,7 @@ int cmnd_off(bpctl_dev_t *pbpctl_dev)
} }
/* BYPASS_ON (0xa)*/ /* BYPASS_ON (0xa)*/
int bypass_on(bpctl_dev_t *pbpctl_dev) int bypass_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -1835,7 +1835,7 @@ int bypass_on(bpctl_dev_t *pbpctl_dev) ...@@ -1835,7 +1835,7 @@ int bypass_on(bpctl_dev_t *pbpctl_dev)
} }
/* BYPASS_OFF (0x8 111)*/ /* BYPASS_OFF (0x8 111)*/
int bypass_off(bpctl_dev_t *pbpctl_dev) int bypass_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -1858,7 +1858,7 @@ int bypass_off(bpctl_dev_t *pbpctl_dev) ...@@ -1858,7 +1858,7 @@ int bypass_off(bpctl_dev_t *pbpctl_dev)
} }
/* TAP_OFF (0x9)*/ /* TAP_OFF (0x9)*/
int tap_off(bpctl_dev_t *pbpctl_dev) int tap_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if ((pbpctl_dev->bp_caps & TAP_CAP) if ((pbpctl_dev->bp_caps & TAP_CAP)
...@@ -1871,7 +1871,7 @@ int tap_off(bpctl_dev_t *pbpctl_dev) ...@@ -1871,7 +1871,7 @@ int tap_off(bpctl_dev_t *pbpctl_dev)
} }
/* TAP_ON (0xb)*/ /* TAP_ON (0xb)*/
int tap_on(bpctl_dev_t *pbpctl_dev) int tap_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if ((pbpctl_dev->bp_caps & TAP_CAP) if ((pbpctl_dev->bp_caps & TAP_CAP)
...@@ -1884,7 +1884,7 @@ int tap_on(bpctl_dev_t *pbpctl_dev) ...@@ -1884,7 +1884,7 @@ int tap_on(bpctl_dev_t *pbpctl_dev)
} }
/* DISC_OFF (0x9)*/ /* DISC_OFF (0x9)*/
int disc_off(bpctl_dev_t *pbpctl_dev) int disc_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) { if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) {
...@@ -1896,7 +1896,7 @@ int disc_off(bpctl_dev_t *pbpctl_dev) ...@@ -1896,7 +1896,7 @@ int disc_off(bpctl_dev_t *pbpctl_dev)
} }
/* DISC_ON (0xb)*/ /* DISC_ON (0xb)*/
int disc_on(bpctl_dev_t *pbpctl_dev) int disc_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) { if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) {
...@@ -1908,10 +1908,10 @@ int disc_on(bpctl_dev_t *pbpctl_dev) ...@@ -1908,10 +1908,10 @@ int disc_on(bpctl_dev_t *pbpctl_dev)
} }
/* DISC_PORT_ON */ /* DISC_PORT_ON */
int disc_port_on(bpctl_dev_t *pbpctl_dev) int disc_port_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
...@@ -1933,10 +1933,10 @@ int disc_port_on(bpctl_dev_t *pbpctl_dev) ...@@ -1933,10 +1933,10 @@ int disc_port_on(bpctl_dev_t *pbpctl_dev)
} }
/* DISC_PORT_OFF */ /* DISC_PORT_OFF */
int disc_port_off(bpctl_dev_t *pbpctl_dev) int disc_port_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
...@@ -1958,10 +1958,10 @@ int disc_port_off(bpctl_dev_t *pbpctl_dev) ...@@ -1958,10 +1958,10 @@ int disc_port_off(bpctl_dev_t *pbpctl_dev)
} }
/*TWO_PORT_LINK_HW_EN (0xe)*/ /*TWO_PORT_LINK_HW_EN (0xe)*/
int tpl_hw_on(bpctl_dev_t *pbpctl_dev) int tpl_hw_on(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0, ctrl = 0; int ret = 0, ctrl = 0;
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -1986,10 +1986,10 @@ int tpl_hw_on(bpctl_dev_t *pbpctl_dev) ...@@ -1986,10 +1986,10 @@ int tpl_hw_on(bpctl_dev_t *pbpctl_dev)
} }
/*TWO_PORT_LINK_HW_DIS (0xc)*/ /*TWO_PORT_LINK_HW_DIS (0xc)*/
int tpl_hw_off(bpctl_dev_t *pbpctl_dev) int tpl_hw_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0, ctrl = 0; int ret = 0, ctrl = 0;
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -2012,7 +2012,7 @@ int tpl_hw_off(bpctl_dev_t *pbpctl_dev) ...@@ -2012,7 +2012,7 @@ int tpl_hw_off(bpctl_dev_t *pbpctl_dev)
} }
/* WDT_OFF (0x6 110)*/ /* WDT_OFF (0x6 110)*/
int wdt_off(bpctl_dev_t *pbpctl_dev) int wdt_off(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -2035,7 +2035,7 @@ int wdt_off(bpctl_dev_t *pbpctl_dev) ...@@ -2035,7 +2035,7 @@ int wdt_off(bpctl_dev_t *pbpctl_dev)
static unsigned int static unsigned int
wdt_val_array[] = { 1000, 1500, 2000, 3000, 4000, 8000, 16000, 32000, 0 }; wdt_val_array[] = { 1000, 1500, 2000, 3000, 4000, 8000, 16000, 32000, 0 };
int wdt_on(bpctl_dev_t *pbpctl_dev, unsigned int timeout) int wdt_on(struct bpctl_dev *pbpctl_dev, unsigned int timeout)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -2087,7 +2087,7 @@ int wdt_on(bpctl_dev_t *pbpctl_dev, unsigned int timeout) ...@@ -2087,7 +2087,7 @@ int wdt_on(bpctl_dev_t *pbpctl_dev, unsigned int timeout)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
void bp75_put_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev) void bp75_put_hw_semaphore_generic(struct bpctl_dev *pbpctl_dev)
{ {
u32 swsm; u32 swsm;
...@@ -2098,7 +2098,7 @@ void bp75_put_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev) ...@@ -2098,7 +2098,7 @@ void bp75_put_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev)
BPCTL_WRITE_REG(pbpctl_dev, SWSM, swsm); BPCTL_WRITE_REG(pbpctl_dev, SWSM, swsm);
} }
s32 bp75_get_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev) s32 bp75_get_hw_semaphore_generic(struct bpctl_dev *pbpctl_dev)
{ {
u32 swsm; u32 swsm;
s32 ret_val = 0; s32 ret_val = 0;
...@@ -2146,7 +2146,7 @@ s32 bp75_get_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev) ...@@ -2146,7 +2146,7 @@ s32 bp75_get_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev)
return ret_val; return ret_val;
} }
static void bp75_release_phy(bpctl_dev_t *pbpctl_dev) static void bp75_release_phy(struct bpctl_dev *pbpctl_dev)
{ {
u16 mask = BPCTLI_SWFW_PHY0_SM; u16 mask = BPCTLI_SWFW_PHY0_SM;
u32 swfw_sync; u32 swfw_sync;
...@@ -2166,7 +2166,7 @@ static void bp75_release_phy(bpctl_dev_t *pbpctl_dev) ...@@ -2166,7 +2166,7 @@ static void bp75_release_phy(bpctl_dev_t *pbpctl_dev)
bp75_put_hw_semaphore_generic(pbpctl_dev); bp75_put_hw_semaphore_generic(pbpctl_dev);
} }
static s32 bp75_acquire_phy(bpctl_dev_t *pbpctl_dev) static s32 bp75_acquire_phy(struct bpctl_dev *pbpctl_dev)
{ {
u16 mask = BPCTLI_SWFW_PHY0_SM; u16 mask = BPCTLI_SWFW_PHY0_SM;
u32 swfw_sync; u32 swfw_sync;
...@@ -2212,7 +2212,7 @@ static s32 bp75_acquire_phy(bpctl_dev_t *pbpctl_dev) ...@@ -2212,7 +2212,7 @@ static s32 bp75_acquire_phy(bpctl_dev_t *pbpctl_dev)
return ret_val; return ret_val;
} }
s32 bp75_read_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data) s32 bp75_read_phy_reg_mdic(struct bpctl_dev *pbpctl_dev, u32 offset, u16 *data)
{ {
u32 i, mdic = 0; u32 i, mdic = 0;
s32 ret_val = 0; s32 ret_val = 0;
...@@ -2245,7 +2245,7 @@ s32 bp75_read_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data) ...@@ -2245,7 +2245,7 @@ s32 bp75_read_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data)
return ret_val; return ret_val;
} }
s32 bp75_write_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data) s32 bp75_write_phy_reg_mdic(struct bpctl_dev *pbpctl_dev, u32 offset, u16 data)
{ {
u32 i, mdic = 0; u32 i, mdic = 0;
s32 ret_val = 0; s32 ret_val = 0;
...@@ -2278,7 +2278,7 @@ s32 bp75_write_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data) ...@@ -2278,7 +2278,7 @@ s32 bp75_write_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data)
return ret_val; return ret_val;
} }
static s32 bp75_read_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data) static s32 bp75_read_phy_reg(struct bpctl_dev *pbpctl_dev, u32 offset, u16 *data)
{ {
s32 ret_val = 0; s32 ret_val = 0;
...@@ -2304,7 +2304,7 @@ static s32 bp75_read_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data) ...@@ -2304,7 +2304,7 @@ static s32 bp75_read_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data)
return ret_val; return ret_val;
} }
static s32 bp75_write_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data) static s32 bp75_write_phy_reg(struct bpctl_dev *pbpctl_dev, u32 offset, u16 data)
{ {
s32 ret_val = 0; s32 ret_val = 0;
...@@ -2332,10 +2332,10 @@ static s32 bp75_write_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data) ...@@ -2332,10 +2332,10 @@ static s32 bp75_write_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data)
} }
/* SET_TX (non-Bypass command :)) */ /* SET_TX (non-Bypass command :)) */
static int set_tx(bpctl_dev_t *pbpctl_dev, int tx_state) static int set_tx(struct bpctl_dev *pbpctl_dev, int tx_state)
{ {
int ret = 0, ctrl = 0; int ret = 0, ctrl = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
else else
...@@ -2532,7 +2532,7 @@ static int set_tx(bpctl_dev_t *pbpctl_dev, int tx_state) ...@@ -2532,7 +2532,7 @@ static int set_tx(bpctl_dev_t *pbpctl_dev, int tx_state)
} }
/* SET_FORCE_LINK (non-Bypass command :)) */ /* SET_FORCE_LINK (non-Bypass command :)) */
static int set_bp_force_link(bpctl_dev_t *pbpctl_dev, int tx_state) static int set_bp_force_link(struct bpctl_dev *pbpctl_dev, int tx_state)
{ {
int ret = 0, ctrl = 0; int ret = 0, ctrl = 0;
...@@ -2556,7 +2556,7 @@ static int set_bp_force_link(bpctl_dev_t *pbpctl_dev, int tx_state) ...@@ -2556,7 +2556,7 @@ static int set_bp_force_link(bpctl_dev_t *pbpctl_dev, int tx_state)
} }
/*RESET_CONT 0x20 */ /*RESET_CONT 0x20 */
int reset_cont(bpctl_dev_t *pbpctl_dev) int reset_cont(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -2573,7 +2573,7 @@ int reset_cont(bpctl_dev_t *pbpctl_dev) ...@@ -2573,7 +2573,7 @@ int reset_cont(bpctl_dev_t *pbpctl_dev)
} }
/*DIS_BYPASS_CAP 0x22 */ /*DIS_BYPASS_CAP 0x22 */
int dis_bypass_cap(bpctl_dev_t *pbpctl_dev) int dis_bypass_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_DIS_CAP) { if (pbpctl_dev->bp_caps & BP_DIS_CAP) {
...@@ -2592,7 +2592,7 @@ int dis_bypass_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2592,7 +2592,7 @@ int dis_bypass_cap(bpctl_dev_t *pbpctl_dev)
} }
/*EN_BYPASS_CAP 0x24 */ /*EN_BYPASS_CAP 0x24 */
int en_bypass_cap(bpctl_dev_t *pbpctl_dev) int en_bypass_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_DIS_CAP) { if (pbpctl_dev->bp_caps & BP_DIS_CAP) {
if (INTEL_IF_SERIES(pbpctl_dev->subdevice)) { if (INTEL_IF_SERIES(pbpctl_dev->subdevice)) {
...@@ -2608,7 +2608,7 @@ int en_bypass_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2608,7 +2608,7 @@ int en_bypass_cap(bpctl_dev_t *pbpctl_dev)
} }
/* BYPASS_STATE_PWRON 0x26*/ /* BYPASS_STATE_PWRON 0x26*/
int bypass_state_pwron(bpctl_dev_t *pbpctl_dev) int bypass_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & BP_PWUP_CTL_CAP) {
write_data(pbpctl_dev, BYPASS_STATE_PWRON); write_data(pbpctl_dev, BYPASS_STATE_PWRON);
...@@ -2622,7 +2622,7 @@ int bypass_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2622,7 +2622,7 @@ int bypass_state_pwron(bpctl_dev_t *pbpctl_dev)
} }
/* NORMAL_STATE_PWRON 0x28*/ /* NORMAL_STATE_PWRON 0x28*/
int normal_state_pwron(bpctl_dev_t *pbpctl_dev) int normal_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
if ((pbpctl_dev->bp_caps & BP_PWUP_CTL_CAP) if ((pbpctl_dev->bp_caps & BP_PWUP_CTL_CAP)
|| (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP)) { || (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP)) {
...@@ -2637,7 +2637,7 @@ int normal_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2637,7 +2637,7 @@ int normal_state_pwron(bpctl_dev_t *pbpctl_dev)
} }
/* BYPASS_STATE_PWROFF 0x27*/ /* BYPASS_STATE_PWROFF 0x27*/
int bypass_state_pwroff(bpctl_dev_t *pbpctl_dev) int bypass_state_pwroff(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_PWOFF_CTL_CAP) { if (pbpctl_dev->bp_caps & BP_PWOFF_CTL_CAP) {
write_data(pbpctl_dev, BYPASS_STATE_PWROFF); write_data(pbpctl_dev, BYPASS_STATE_PWROFF);
...@@ -2648,7 +2648,7 @@ int bypass_state_pwroff(bpctl_dev_t *pbpctl_dev) ...@@ -2648,7 +2648,7 @@ int bypass_state_pwroff(bpctl_dev_t *pbpctl_dev)
} }
/* NORMAL_STATE_PWROFF 0x29*/ /* NORMAL_STATE_PWROFF 0x29*/
int normal_state_pwroff(bpctl_dev_t *pbpctl_dev) int normal_state_pwroff(struct bpctl_dev *pbpctl_dev)
{ {
if ((pbpctl_dev->bp_caps & BP_PWOFF_CTL_CAP)) { if ((pbpctl_dev->bp_caps & BP_PWOFF_CTL_CAP)) {
write_data(pbpctl_dev, NORMAL_STATE_PWROFF); write_data(pbpctl_dev, NORMAL_STATE_PWROFF);
...@@ -2659,7 +2659,7 @@ int normal_state_pwroff(bpctl_dev_t *pbpctl_dev) ...@@ -2659,7 +2659,7 @@ int normal_state_pwroff(bpctl_dev_t *pbpctl_dev)
} }
/*TAP_STATE_PWRON 0x2a*/ /*TAP_STATE_PWRON 0x2a*/
int tap_state_pwron(bpctl_dev_t *pbpctl_dev) int tap_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) {
write_data(pbpctl_dev, TAP_STATE_PWRON); write_data(pbpctl_dev, TAP_STATE_PWRON);
...@@ -2670,7 +2670,7 @@ int tap_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2670,7 +2670,7 @@ int tap_state_pwron(bpctl_dev_t *pbpctl_dev)
} }
/*DIS_TAP_CAP 0x2c*/ /*DIS_TAP_CAP 0x2c*/
int dis_tap_cap(bpctl_dev_t *pbpctl_dev) int dis_tap_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_DIS_CAP) { if (pbpctl_dev->bp_caps & TAP_DIS_CAP) {
write_data(pbpctl_dev, DIS_TAP_CAP); write_data(pbpctl_dev, DIS_TAP_CAP);
...@@ -2681,7 +2681,7 @@ int dis_tap_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2681,7 +2681,7 @@ int dis_tap_cap(bpctl_dev_t *pbpctl_dev)
} }
/*EN_TAP_CAP 0x2e*/ /*EN_TAP_CAP 0x2e*/
int en_tap_cap(bpctl_dev_t *pbpctl_dev) int en_tap_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_DIS_CAP) { if (pbpctl_dev->bp_caps & TAP_DIS_CAP) {
write_data(pbpctl_dev, EN_TAP_CAP); write_data(pbpctl_dev, EN_TAP_CAP);
...@@ -2692,7 +2692,7 @@ int en_tap_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2692,7 +2692,7 @@ int en_tap_cap(bpctl_dev_t *pbpctl_dev)
} }
/*DISC_STATE_PWRON 0x2a*/ /*DISC_STATE_PWRON 0x2a*/
int disc_state_pwron(bpctl_dev_t *pbpctl_dev) int disc_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DISC_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & DISC_PWUP_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) { if (pbpctl_dev->bp_ext_ver >= 0x8) {
...@@ -2705,7 +2705,7 @@ int disc_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2705,7 +2705,7 @@ int disc_state_pwron(bpctl_dev_t *pbpctl_dev)
} }
/*DIS_DISC_CAP 0x2c*/ /*DIS_DISC_CAP 0x2c*/
int dis_disc_cap(bpctl_dev_t *pbpctl_dev) int dis_disc_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DISC_DIS_CAP) { if (pbpctl_dev->bp_caps & DISC_DIS_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) { if (pbpctl_dev->bp_ext_ver >= 0x8) {
...@@ -2718,10 +2718,10 @@ int dis_disc_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2718,10 +2718,10 @@ int dis_disc_cap(bpctl_dev_t *pbpctl_dev)
} }
/*DISC_STATE_PWRON 0x2a*/ /*DISC_STATE_PWRON 0x2a*/
int disc_port_state_pwron(bpctl_dev_t *pbpctl_dev) int disc_port_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
return BP_NOT_CAP; return BP_NOT_CAP;
...@@ -2744,10 +2744,10 @@ int disc_port_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2744,10 +2744,10 @@ int disc_port_state_pwron(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int normal_port_state_pwron(bpctl_dev_t *pbpctl_dev) int normal_port_state_pwron(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
return BP_NOT_CAP; return BP_NOT_CAP;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
...@@ -2770,7 +2770,7 @@ int normal_port_state_pwron(bpctl_dev_t *pbpctl_dev) ...@@ -2770,7 +2770,7 @@ int normal_port_state_pwron(bpctl_dev_t *pbpctl_dev)
} }
/*EN_TAP_CAP 0x2e*/ /*EN_TAP_CAP 0x2e*/
int en_disc_cap(bpctl_dev_t *pbpctl_dev) int en_disc_cap(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DISC_DIS_CAP) { if (pbpctl_dev->bp_caps & DISC_DIS_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) { if (pbpctl_dev->bp_ext_ver >= 0x8) {
...@@ -2782,7 +2782,7 @@ int en_disc_cap(bpctl_dev_t *pbpctl_dev) ...@@ -2782,7 +2782,7 @@ int en_disc_cap(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int std_nic_on(bpctl_dev_t *pbpctl_dev) int std_nic_on(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & STD_NIC_CAP) { if (pbpctl_dev->bp_caps & STD_NIC_CAP) {
...@@ -2836,7 +2836,7 @@ int std_nic_on(bpctl_dev_t *pbpctl_dev) ...@@ -2836,7 +2836,7 @@ int std_nic_on(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int std_nic_off(bpctl_dev_t *pbpctl_dev) int std_nic_off(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & STD_NIC_CAP) { if (pbpctl_dev->bp_caps & STD_NIC_CAP) {
...@@ -2888,7 +2888,7 @@ int std_nic_off(bpctl_dev_t *pbpctl_dev) ...@@ -2888,7 +2888,7 @@ int std_nic_off(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int wdt_time_left(bpctl_dev_t *pbpctl_dev) int wdt_time_left(struct bpctl_dev *pbpctl_dev)
{ {
/* unsigned long curr_time=((long long)(jiffies*1000))/HZ, delta_time=0,wdt_on_time=((long long)(pbpctl_dev->bypass_wdt_on_time*1000))/HZ; */ /* unsigned long curr_time=((long long)(jiffies*1000))/HZ, delta_time=0,wdt_on_time=((long long)(pbpctl_dev->bypass_wdt_on_time*1000))/HZ; */
...@@ -2920,7 +2920,7 @@ int wdt_time_left(bpctl_dev_t *pbpctl_dev) ...@@ -2920,7 +2920,7 @@ int wdt_time_left(bpctl_dev_t *pbpctl_dev)
return time_left; return time_left;
} }
static int wdt_timer(bpctl_dev_t *pbpctl_dev, int *time_left) static int wdt_timer(struct bpctl_dev *pbpctl_dev, int *time_left)
{ {
int ret = 0; int ret = 0;
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -2936,7 +2936,7 @@ static int wdt_timer(bpctl_dev_t *pbpctl_dev, int *time_left) ...@@ -2936,7 +2936,7 @@ static int wdt_timer(bpctl_dev_t *pbpctl_dev, int *time_left)
return ret; return ret;
} }
static int wdt_timer_reload(bpctl_dev_t *pbpctl_dev) static int wdt_timer_reload(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
...@@ -2960,7 +2960,7 @@ static int wdt_timer_reload(bpctl_dev_t *pbpctl_dev) ...@@ -2960,7 +2960,7 @@ static int wdt_timer_reload(bpctl_dev_t *pbpctl_dev)
static void wd_reset_timer(unsigned long param) static void wd_reset_timer(unsigned long param)
{ {
bpctl_dev_t *pbpctl_dev = (bpctl_dev_t *) param; struct bpctl_dev *pbpctl_dev = (struct bpctl_dev *) param;
#ifdef BP_SELF_TEST #ifdef BP_SELF_TEST
struct sk_buff *skb_tmp; struct sk_buff *skb_tmp;
#endif #endif
...@@ -2999,7 +2999,7 @@ static void wd_reset_timer(unsigned long param) ...@@ -2999,7 +2999,7 @@ static void wd_reset_timer(unsigned long param)
} }
/*WAIT_AT_PWRUP 0x80 */ /*WAIT_AT_PWRUP 0x80 */
int bp_wait_at_pwup_en(bpctl_dev_t *pbpctl_dev) int bp_wait_at_pwup_en(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3014,7 +3014,7 @@ int bp_wait_at_pwup_en(bpctl_dev_t *pbpctl_dev) ...@@ -3014,7 +3014,7 @@ int bp_wait_at_pwup_en(bpctl_dev_t *pbpctl_dev)
} }
/*DIS_WAIT_AT_PWRUP 0x81 */ /*DIS_WAIT_AT_PWRUP 0x81 */
int bp_wait_at_pwup_dis(bpctl_dev_t *pbpctl_dev) int bp_wait_at_pwup_dis(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3031,7 +3031,7 @@ int bp_wait_at_pwup_dis(bpctl_dev_t *pbpctl_dev) ...@@ -3031,7 +3031,7 @@ int bp_wait_at_pwup_dis(bpctl_dev_t *pbpctl_dev)
/*EN_HW_RESET 0x82 */ /*EN_HW_RESET 0x82 */
int bp_hw_reset_en(bpctl_dev_t *pbpctl_dev) int bp_hw_reset_en(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3047,7 +3047,7 @@ int bp_hw_reset_en(bpctl_dev_t *pbpctl_dev) ...@@ -3047,7 +3047,7 @@ int bp_hw_reset_en(bpctl_dev_t *pbpctl_dev)
/*DIS_HW_RESET 0x83 */ /*DIS_HW_RESET 0x83 */
int bp_hw_reset_dis(bpctl_dev_t *pbpctl_dev) int bp_hw_reset_dis(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3062,7 +3062,7 @@ int bp_hw_reset_dis(bpctl_dev_t *pbpctl_dev) ...@@ -3062,7 +3062,7 @@ int bp_hw_reset_dis(bpctl_dev_t *pbpctl_dev)
} }
int wdt_exp_mode(bpctl_dev_t *pbpctl_dev, int mode) int wdt_exp_mode(struct bpctl_dev *pbpctl_dev, int mode)
{ {
uint32_t status_reg = 0, status_reg1 = 0; uint32_t status_reg = 0, status_reg1 = 0;
...@@ -3113,7 +3113,7 @@ int wdt_exp_mode(bpctl_dev_t *pbpctl_dev, int mode) ...@@ -3113,7 +3113,7 @@ int wdt_exp_mode(bpctl_dev_t *pbpctl_dev, int mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_fw_ver(bpctl_dev_t *pbpctl_dev) int bypass_fw_ver(struct bpctl_dev *pbpctl_dev)
{ {
if (is_bypass_fn(pbpctl_dev)) if (is_bypass_fn(pbpctl_dev))
return read_reg(pbpctl_dev, VER_REG_ADDR); return read_reg(pbpctl_dev, VER_REG_ADDR);
...@@ -3121,7 +3121,7 @@ int bypass_fw_ver(bpctl_dev_t *pbpctl_dev) ...@@ -3121,7 +3121,7 @@ int bypass_fw_ver(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_sign_check(bpctl_dev_t *pbpctl_dev) int bypass_sign_check(struct bpctl_dev *pbpctl_dev)
{ {
if (is_bypass_fn(pbpctl_dev)) if (is_bypass_fn(pbpctl_dev))
...@@ -3131,10 +3131,10 @@ int bypass_sign_check(bpctl_dev_t *pbpctl_dev) ...@@ -3131,10 +3131,10 @@ int bypass_sign_check(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
static int tx_status(bpctl_dev_t *pbpctl_dev) static int tx_status(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl = 0; uint32_t ctrl = 0;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
else else
...@@ -3218,7 +3218,7 @@ static int tx_status(bpctl_dev_t *pbpctl_dev) ...@@ -3218,7 +3218,7 @@ static int tx_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
static int bp_force_link_status(bpctl_dev_t *pbpctl_dev) static int bp_force_link_status(struct bpctl_dev *pbpctl_dev)
{ {
if (DBI_IF_SERIES(pbpctl_dev->subdevice)) { if (DBI_IF_SERIES(pbpctl_dev->subdevice)) {
...@@ -3232,10 +3232,10 @@ static int bp_force_link_status(bpctl_dev_t *pbpctl_dev) ...@@ -3232,10 +3232,10 @@ static int bp_force_link_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_from_last_read(bpctl_dev_t *pbpctl_dev) int bypass_from_last_read(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t ctrl_ext = 0; uint32_t ctrl_ext = 0;
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
...@@ -3252,9 +3252,9 @@ int bypass_from_last_read(bpctl_dev_t *pbpctl_dev) ...@@ -3252,9 +3252,9 @@ int bypass_from_last_read(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_status_clear(bpctl_dev_t *pbpctl_dev) int bypass_status_clear(struct bpctl_dev *pbpctl_dev)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
...@@ -3266,7 +3266,7 @@ int bypass_status_clear(bpctl_dev_t *pbpctl_dev) ...@@ -3266,7 +3266,7 @@ int bypass_status_clear(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_flag_status(bpctl_dev_t *pbpctl_dev) int bypass_flag_status(struct bpctl_dev *pbpctl_dev)
{ {
if ((pbpctl_dev->bp_caps & BP_CAP)) { if ((pbpctl_dev->bp_caps & BP_CAP)) {
...@@ -3279,7 +3279,7 @@ int bypass_flag_status(bpctl_dev_t *pbpctl_dev) ...@@ -3279,7 +3279,7 @@ int bypass_flag_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_flag_status_clear(bpctl_dev_t *pbpctl_dev) int bypass_flag_status_clear(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_CAP) { if (pbpctl_dev->bp_caps & BP_CAP) {
...@@ -3294,7 +3294,7 @@ int bypass_flag_status_clear(bpctl_dev_t *pbpctl_dev) ...@@ -3294,7 +3294,7 @@ int bypass_flag_status_clear(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bypass_change_status(bpctl_dev_t *pbpctl_dev) int bypass_change_status(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -3313,7 +3313,7 @@ int bypass_change_status(bpctl_dev_t *pbpctl_dev) ...@@ -3313,7 +3313,7 @@ int bypass_change_status(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int bypass_off_status(bpctl_dev_t *pbpctl_dev) int bypass_off_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_CAP) { if (pbpctl_dev->bp_caps & BP_CAP) {
...@@ -3325,12 +3325,12 @@ int bypass_off_status(bpctl_dev_t *pbpctl_dev) ...@@ -3325,12 +3325,12 @@ int bypass_off_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
static int bypass_status(bpctl_dev_t *pbpctl_dev) static int bypass_status(struct bpctl_dev *pbpctl_dev)
{ {
u32 ctrl_ext = 0; u32 ctrl_ext = 0;
if (pbpctl_dev->bp_caps & BP_CAP) { if (pbpctl_dev->bp_caps & BP_CAP) {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -3408,7 +3408,7 @@ static int bypass_status(bpctl_dev_t *pbpctl_dev) ...@@ -3408,7 +3408,7 @@ static int bypass_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int default_pwron_status(bpctl_dev_t *pbpctl_dev) int default_pwron_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3426,7 +3426,7 @@ int default_pwron_status(bpctl_dev_t *pbpctl_dev) ...@@ -3426,7 +3426,7 @@ int default_pwron_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
static int default_pwroff_status(bpctl_dev_t *pbpctl_dev) static int default_pwroff_status(struct bpctl_dev *pbpctl_dev)
{ {
/*if ((!pbpctl_dev->bp_caps&BP_DIS_CAP)&& /*if ((!pbpctl_dev->bp_caps&BP_DIS_CAP)&&
...@@ -3440,7 +3440,7 @@ static int default_pwroff_status(bpctl_dev_t *pbpctl_dev) ...@@ -3440,7 +3440,7 @@ static int default_pwroff_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int dis_bypass_cap_status(bpctl_dev_t *pbpctl_dev) int dis_bypass_cap_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & BP_DIS_CAP) { if (pbpctl_dev->bp_caps & BP_DIS_CAP) {
...@@ -3453,7 +3453,7 @@ int dis_bypass_cap_status(bpctl_dev_t *pbpctl_dev) ...@@ -3453,7 +3453,7 @@ int dis_bypass_cap_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int cmd_en_status(bpctl_dev_t *pbpctl_dev) int cmd_en_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3465,7 +3465,7 @@ int cmd_en_status(bpctl_dev_t *pbpctl_dev) ...@@ -3465,7 +3465,7 @@ int cmd_en_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int wdt_en_status(bpctl_dev_t *pbpctl_dev) int wdt_en_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -3477,7 +3477,7 @@ int wdt_en_status(bpctl_dev_t *pbpctl_dev) ...@@ -3477,7 +3477,7 @@ int wdt_en_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int wdt_programmed(bpctl_dev_t *pbpctl_dev, int *timeout) int wdt_programmed(struct bpctl_dev *pbpctl_dev, int *timeout)
{ {
int ret = 0; int ret = 0;
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -3503,7 +3503,7 @@ int wdt_programmed(bpctl_dev_t *pbpctl_dev, int *timeout) ...@@ -3503,7 +3503,7 @@ int wdt_programmed(bpctl_dev_t *pbpctl_dev, int *timeout)
return ret; return ret;
} }
int bypass_support(bpctl_dev_t *pbpctl_dev) int bypass_support(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
...@@ -3520,7 +3520,7 @@ int bypass_support(bpctl_dev_t *pbpctl_dev) ...@@ -3520,7 +3520,7 @@ int bypass_support(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int tap_support(bpctl_dev_t *pbpctl_dev) int tap_support(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
...@@ -3536,7 +3536,7 @@ int tap_support(bpctl_dev_t *pbpctl_dev) ...@@ -3536,7 +3536,7 @@ int tap_support(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int normal_support(bpctl_dev_t *pbpctl_dev) int normal_support(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
...@@ -3552,7 +3552,7 @@ int normal_support(bpctl_dev_t *pbpctl_dev) ...@@ -3552,7 +3552,7 @@ int normal_support(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int get_bp_prod_caps(bpctl_dev_t *pbpctl_dev) int get_bp_prod_caps(struct bpctl_dev *pbpctl_dev)
{ {
if ((pbpctl_dev->bp_caps & SW_CTL_CAP) && if ((pbpctl_dev->bp_caps & SW_CTL_CAP) &&
(pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER)) (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER))
...@@ -3561,7 +3561,7 @@ int get_bp_prod_caps(bpctl_dev_t *pbpctl_dev) ...@@ -3561,7 +3561,7 @@ int get_bp_prod_caps(bpctl_dev_t *pbpctl_dev)
} }
int tap_flag_status(bpctl_dev_t *pbpctl_dev) int tap_flag_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_STATUS_CAP) { if (pbpctl_dev->bp_caps & TAP_STATUS_CAP) {
...@@ -3573,7 +3573,7 @@ int tap_flag_status(bpctl_dev_t *pbpctl_dev) ...@@ -3573,7 +3573,7 @@ int tap_flag_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int tap_flag_status_clear(bpctl_dev_t *pbpctl_dev) int tap_flag_status_clear(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t status_reg = 0; uint32_t status_reg = 0;
if (pbpctl_dev->bp_caps & TAP_STATUS_CAP) { if (pbpctl_dev->bp_caps & TAP_STATUS_CAP) {
...@@ -3587,7 +3587,7 @@ int tap_flag_status_clear(bpctl_dev_t *pbpctl_dev) ...@@ -3587,7 +3587,7 @@ int tap_flag_status_clear(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int tap_change_status(bpctl_dev_t *pbpctl_dev) int tap_change_status(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER) { if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER) {
...@@ -3604,7 +3604,7 @@ int tap_change_status(bpctl_dev_t *pbpctl_dev) ...@@ -3604,7 +3604,7 @@ int tap_change_status(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int tap_off_status(bpctl_dev_t *pbpctl_dev) int tap_off_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_CAP) { if (pbpctl_dev->bp_caps & TAP_CAP) {
if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER) if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER)
...@@ -3614,12 +3614,12 @@ int tap_off_status(bpctl_dev_t *pbpctl_dev) ...@@ -3614,12 +3614,12 @@ int tap_off_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int tap_status(bpctl_dev_t *pbpctl_dev) int tap_status(struct bpctl_dev *pbpctl_dev)
{ {
u32 ctrl_ext = 0; u32 ctrl_ext = 0;
if (pbpctl_dev->bp_caps & TAP_CAP) { if (pbpctl_dev->bp_caps & TAP_CAP) {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -3653,7 +3653,7 @@ int tap_status(bpctl_dev_t *pbpctl_dev) ...@@ -3653,7 +3653,7 @@ int tap_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int default_pwron_tap_status(bpctl_dev_t *pbpctl_dev) int default_pwron_tap_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER) if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER)
...@@ -3664,7 +3664,7 @@ int default_pwron_tap_status(bpctl_dev_t *pbpctl_dev) ...@@ -3664,7 +3664,7 @@ int default_pwron_tap_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int dis_tap_cap_status(bpctl_dev_t *pbpctl_dev) int dis_tap_cap_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & TAP_PWUP_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER) if (pbpctl_dev->bp_ext_ver >= PXG2TBPI_VER)
...@@ -3675,7 +3675,7 @@ int dis_tap_cap_status(bpctl_dev_t *pbpctl_dev) ...@@ -3675,7 +3675,7 @@ int dis_tap_cap_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int disc_flag_status(bpctl_dev_t *pbpctl_dev) int disc_flag_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DISC_CAP) { if (pbpctl_dev->bp_caps & DISC_CAP) {
...@@ -3687,7 +3687,7 @@ int disc_flag_status(bpctl_dev_t *pbpctl_dev) ...@@ -3687,7 +3687,7 @@ int disc_flag_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int disc_flag_status_clear(bpctl_dev_t *pbpctl_dev) int disc_flag_status_clear(struct bpctl_dev *pbpctl_dev)
{ {
uint32_t status_reg = 0; uint32_t status_reg = 0;
if (pbpctl_dev->bp_caps & DISC_CAP) { if (pbpctl_dev->bp_caps & DISC_CAP) {
...@@ -3701,7 +3701,7 @@ int disc_flag_status_clear(bpctl_dev_t *pbpctl_dev) ...@@ -3701,7 +3701,7 @@ int disc_flag_status_clear(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int disc_change_status(bpctl_dev_t *pbpctl_dev) int disc_change_status(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if (pbpctl_dev->bp_caps & DISC_CAP) { if (pbpctl_dev->bp_caps & DISC_CAP) {
...@@ -3712,9 +3712,9 @@ int disc_change_status(bpctl_dev_t *pbpctl_dev) ...@@ -3712,9 +3712,9 @@ int disc_change_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int disc_off_status(bpctl_dev_t *pbpctl_dev) int disc_off_status(struct bpctl_dev *pbpctl_dev)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
u32 ctrl_ext = 0; u32 ctrl_ext = 0;
if (pbpctl_dev->bp_caps & DISC_CAP) { if (pbpctl_dev->bp_caps & DISC_CAP) {
...@@ -3796,7 +3796,7 @@ int disc_off_status(bpctl_dev_t *pbpctl_dev) ...@@ -3796,7 +3796,7 @@ int disc_off_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
static int disc_status(bpctl_dev_t *pbpctl_dev) static int disc_status(struct bpctl_dev *pbpctl_dev)
{ {
int ctrl = 0; int ctrl = 0;
if (pbpctl_dev->bp_caps & DISC_CAP) { if (pbpctl_dev->bp_caps & DISC_CAP) {
...@@ -3808,7 +3808,7 @@ static int disc_status(bpctl_dev_t *pbpctl_dev) ...@@ -3808,7 +3808,7 @@ static int disc_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int default_pwron_disc_status(bpctl_dev_t *pbpctl_dev) int default_pwron_disc_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DISC_PWUP_CTL_CAP) { if (pbpctl_dev->bp_caps & DISC_PWUP_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) if (pbpctl_dev->bp_ext_ver >= 0x8)
...@@ -3819,7 +3819,7 @@ int default_pwron_disc_status(bpctl_dev_t *pbpctl_dev) ...@@ -3819,7 +3819,7 @@ int default_pwron_disc_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int dis_disc_cap_status(bpctl_dev_t *pbpctl_dev) int dis_disc_cap_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & DIS_DISC_CAP) { if (pbpctl_dev->bp_caps & DIS_DISC_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) if (pbpctl_dev->bp_ext_ver >= 0x8)
...@@ -3830,10 +3830,10 @@ int dis_disc_cap_status(bpctl_dev_t *pbpctl_dev) ...@@ -3830,10 +3830,10 @@ int dis_disc_cap_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int disc_port_status(bpctl_dev_t *pbpctl_dev) int disc_port_status(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
...@@ -3854,10 +3854,10 @@ int disc_port_status(bpctl_dev_t *pbpctl_dev) ...@@ -3854,10 +3854,10 @@ int disc_port_status(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int default_pwron_disc_port_status(bpctl_dev_t *pbpctl_dev) int default_pwron_disc_port_status(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
bpctl_dev_t *pbpctl_dev_m; struct bpctl_dev *pbpctl_dev_m;
if ((is_bypass_fn(pbpctl_dev)) == 1) if ((is_bypass_fn(pbpctl_dev)) == 1)
pbpctl_dev_m = pbpctl_dev; pbpctl_dev_m = pbpctl_dev;
...@@ -3878,7 +3878,7 @@ int default_pwron_disc_port_status(bpctl_dev_t *pbpctl_dev) ...@@ -3878,7 +3878,7 @@ int default_pwron_disc_port_status(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int wdt_exp_mode_status(bpctl_dev_t *pbpctl_dev) int wdt_exp_mode_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver <= PXG2BPI_VER) if (pbpctl_dev->bp_ext_ver <= PXG2BPI_VER)
...@@ -3901,7 +3901,7 @@ int wdt_exp_mode_status(bpctl_dev_t *pbpctl_dev) ...@@ -3901,7 +3901,7 @@ int wdt_exp_mode_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int tpl2_flag_status(bpctl_dev_t *pbpctl_dev) int tpl2_flag_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps_ex & TPL2_CAP_EX) { if (pbpctl_dev->bp_caps_ex & TPL2_CAP_EX) {
...@@ -3912,9 +3912,9 @@ int tpl2_flag_status(bpctl_dev_t *pbpctl_dev) ...@@ -3912,9 +3912,9 @@ int tpl2_flag_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int tpl_hw_status(bpctl_dev_t *pbpctl_dev) int tpl_hw_status(struct bpctl_dev *pbpctl_dev)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -3927,7 +3927,7 @@ int tpl_hw_status(bpctl_dev_t *pbpctl_dev) ...@@ -3927,7 +3927,7 @@ int tpl_hw_status(bpctl_dev_t *pbpctl_dev)
} }
int bp_wait_at_pwup_status(bpctl_dev_t *pbpctl_dev) int bp_wait_at_pwup_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
if (pbpctl_dev->bp_ext_ver >= 0x8) if (pbpctl_dev->bp_ext_ver >= 0x8)
...@@ -3938,7 +3938,7 @@ int bp_wait_at_pwup_status(bpctl_dev_t *pbpctl_dev) ...@@ -3938,7 +3938,7 @@ int bp_wait_at_pwup_status(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int bp_hw_reset_status(bpctl_dev_t *pbpctl_dev) int bp_hw_reset_status(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & SW_CTL_CAP) { if (pbpctl_dev->bp_caps & SW_CTL_CAP) {
...@@ -3952,7 +3952,7 @@ int bp_hw_reset_status(bpctl_dev_t *pbpctl_dev) ...@@ -3952,7 +3952,7 @@ int bp_hw_reset_status(bpctl_dev_t *pbpctl_dev)
} }
int std_nic_status(bpctl_dev_t *pbpctl_dev) int std_nic_status(struct bpctl_dev *pbpctl_dev)
{ {
int status_val = 0; int status_val = 0;
...@@ -4000,10 +4000,10 @@ int std_nic_status(bpctl_dev_t *pbpctl_dev) ...@@ -4000,10 +4000,10 @@ int std_nic_status(bpctl_dev_t *pbpctl_dev)
/******************************************************/ /******************************************************/
/**************SW_INIT*********************************/ /**************SW_INIT*********************************/
/******************************************************/ /******************************************************/
void bypass_caps_init(bpctl_dev_t *pbpctl_dev) void bypass_caps_init(struct bpctl_dev *pbpctl_dev)
{ {
u_int32_t ctrl_ext = 0; u_int32_t ctrl_ext = 0;
bpctl_dev_t *pbpctl_dev_m = NULL; struct bpctl_dev *pbpctl_dev_m = NULL;
#ifdef BYPASS_DEBUG #ifdef BYPASS_DEBUG
int ret = 0; int ret = 0;
...@@ -4218,7 +4218,7 @@ void bypass_caps_init(bpctl_dev_t *pbpctl_dev) ...@@ -4218,7 +4218,7 @@ void bypass_caps_init(bpctl_dev_t *pbpctl_dev)
} }
} }
int bypass_off_init(bpctl_dev_t *pbpctl_dev) int bypass_off_init(struct bpctl_dev *pbpctl_dev)
{ {
int ret = cmnd_on(pbpctl_dev); int ret = cmnd_on(pbpctl_dev);
if (ret < 0) if (ret < 0)
...@@ -4234,10 +4234,10 @@ int bypass_off_init(bpctl_dev_t *pbpctl_dev) ...@@ -4234,10 +4234,10 @@ int bypass_off_init(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
void remove_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) void remove_bypass_wd_auto(struct bpctl_dev *pbpctl_dev)
{ {
#ifdef BP_SELF_TEST #ifdef BP_SELF_TEST
bpctl_dev_t *pbpctl_dev_sl = NULL; struct bpctl_dev *pbpctl_dev_sl = NULL;
#endif #endif
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -4263,7 +4263,7 @@ void remove_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) ...@@ -4263,7 +4263,7 @@ void remove_bypass_wd_auto(bpctl_dev_t *pbpctl_dev)
} }
int init_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) int init_bypass_wd_auto(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
init_timer(&pbpctl_dev->bp_timer); init_timer(&pbpctl_dev->bp_timer);
...@@ -4277,7 +4277,7 @@ int init_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) ...@@ -4277,7 +4277,7 @@ int init_bypass_wd_auto(bpctl_dev_t *pbpctl_dev)
#ifdef BP_SELF_TEST #ifdef BP_SELF_TEST
int bp_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) int bp_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
bpctl_dev_t *pbpctl_dev = NULL, *pbpctl_dev_m = NULL; struct bpctl_dev *pbpctl_dev = NULL, *pbpctl_dev_m = NULL;
int idx_dev = 0; int idx_dev = 0;
struct ethhdr *eth = (struct ethhdr *)skb->data; struct ethhdr *eth = (struct ethhdr *)skb->data;
...@@ -4310,7 +4310,7 @@ int bp_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -4310,7 +4310,7 @@ int bp_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
} }
#endif #endif
int set_bypass_wd_auto(bpctl_dev_t *pbpctl_dev, unsigned int param) int set_bypass_wd_auto(struct bpctl_dev *pbpctl_dev, unsigned int param)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
if (pbpctl_dev->reset_time != param) { if (pbpctl_dev->reset_time != param) {
...@@ -4329,7 +4329,7 @@ int set_bypass_wd_auto(bpctl_dev_t *pbpctl_dev, unsigned int param) ...@@ -4329,7 +4329,7 @@ int set_bypass_wd_auto(bpctl_dev_t *pbpctl_dev, unsigned int param)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) int get_bypass_wd_auto(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) if (pbpctl_dev->bp_caps & WD_CTL_CAP)
return pbpctl_dev->reset_time; return pbpctl_dev->reset_time;
...@@ -4339,9 +4339,9 @@ int get_bypass_wd_auto(bpctl_dev_t *pbpctl_dev) ...@@ -4339,9 +4339,9 @@ int get_bypass_wd_auto(bpctl_dev_t *pbpctl_dev)
#ifdef BP_SELF_TEST #ifdef BP_SELF_TEST
int set_bp_self_test(bpctl_dev_t *pbpctl_dev, unsigned int param) int set_bp_self_test(struct bpctl_dev *pbpctl_dev, unsigned int param)
{ {
bpctl_dev_t *pbpctl_dev_sl = NULL; struct bpctl_dev *pbpctl_dev_sl = NULL;
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
pbpctl_dev->bp_self_test_flag = param == 0 ? 0 : 1; pbpctl_dev->bp_self_test_flag = param == 0 ? 0 : 1;
...@@ -4374,7 +4374,7 @@ int set_bp_self_test(bpctl_dev_t *pbpctl_dev, unsigned int param) ...@@ -4374,7 +4374,7 @@ int set_bp_self_test(bpctl_dev_t *pbpctl_dev, unsigned int param)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_bp_self_test(bpctl_dev_t *pbpctl_dev) int get_bp_self_test(struct bpctl_dev *pbpctl_dev)
{ {
if (pbpctl_dev->bp_caps & WD_CTL_CAP) { if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
...@@ -4392,7 +4392,7 @@ int get_bp_self_test(bpctl_dev_t *pbpctl_dev) ...@@ -4392,7 +4392,7 @@ int get_bp_self_test(bpctl_dev_t *pbpctl_dev)
/************************* API ********************************/ /************************* API ********************************/
/**************************************************************/ /**************************************************************/
int is_bypass_fn(bpctl_dev_t *pbpctl_dev) int is_bypass_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4400,7 +4400,7 @@ int is_bypass_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4400,7 +4400,7 @@ int is_bypass_fn(bpctl_dev_t *pbpctl_dev)
return (((pbpctl_dev->func == 0) || (pbpctl_dev->func == 2)) ? 1 : 0); return (((pbpctl_dev->func == 0) || (pbpctl_dev->func == 2)) ? 1 : 0);
} }
int set_bypass_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) int set_bypass_fn(struct bpctl_dev *pbpctl_dev, int bypass_mode)
{ {
int ret = 0; int ret = 0;
...@@ -4418,12 +4418,12 @@ int set_bypass_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) ...@@ -4418,12 +4418,12 @@ int set_bypass_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode)
return ret; return ret;
} }
int get_bypass_fn(bpctl_dev_t *pbpctl_dev) int get_bypass_fn(struct bpctl_dev *pbpctl_dev)
{ {
return bypass_status(pbpctl_dev); return bypass_status(pbpctl_dev);
} }
int get_bypass_change_fn(bpctl_dev_t *pbpctl_dev) int get_bypass_change_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4431,7 +4431,7 @@ int get_bypass_change_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4431,7 +4431,7 @@ int get_bypass_change_fn(bpctl_dev_t *pbpctl_dev)
return bypass_change_status(pbpctl_dev); return bypass_change_status(pbpctl_dev);
} }
int set_dis_bypass_fn(bpctl_dev_t *pbpctl_dev, int dis_param) int set_dis_bypass_fn(struct bpctl_dev *pbpctl_dev, int dis_param)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4450,7 +4450,7 @@ int set_dis_bypass_fn(bpctl_dev_t *pbpctl_dev, int dis_param) ...@@ -4450,7 +4450,7 @@ int set_dis_bypass_fn(bpctl_dev_t *pbpctl_dev, int dis_param)
return ret; return ret;
} }
int get_dis_bypass_fn(bpctl_dev_t *pbpctl_dev) int get_dis_bypass_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4458,7 +4458,7 @@ int get_dis_bypass_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4458,7 +4458,7 @@ int get_dis_bypass_fn(bpctl_dev_t *pbpctl_dev)
return dis_bypass_cap_status(pbpctl_dev); return dis_bypass_cap_status(pbpctl_dev);
} }
int set_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) int set_bypass_pwoff_fn(struct bpctl_dev *pbpctl_dev, int bypass_mode)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4477,7 +4477,7 @@ int set_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) ...@@ -4477,7 +4477,7 @@ int set_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode)
return ret; return ret;
} }
int get_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev) int get_bypass_pwoff_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4485,7 +4485,7 @@ int get_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4485,7 +4485,7 @@ int get_bypass_pwoff_fn(bpctl_dev_t *pbpctl_dev)
return default_pwroff_status(pbpctl_dev); return default_pwroff_status(pbpctl_dev);
} }
int set_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) int set_bypass_pwup_fn(struct bpctl_dev *pbpctl_dev, int bypass_mode)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4504,7 +4504,7 @@ int set_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode) ...@@ -4504,7 +4504,7 @@ int set_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev, int bypass_mode)
return ret; return ret;
} }
int get_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev) int get_bypass_pwup_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4512,7 +4512,7 @@ int get_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4512,7 +4512,7 @@ int get_bypass_pwup_fn(bpctl_dev_t *pbpctl_dev)
return default_pwron_status(pbpctl_dev); return default_pwron_status(pbpctl_dev);
} }
int set_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int timeout) int set_bypass_wd_fn(struct bpctl_dev *pbpctl_dev, int timeout)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4534,7 +4534,7 @@ int set_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int timeout) ...@@ -4534,7 +4534,7 @@ int set_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int timeout)
return ret; return ret;
} }
int get_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int *timeout) int get_bypass_wd_fn(struct bpctl_dev *pbpctl_dev, int *timeout)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4542,7 +4542,7 @@ int get_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int *timeout) ...@@ -4542,7 +4542,7 @@ int get_bypass_wd_fn(bpctl_dev_t *pbpctl_dev, int *timeout)
return wdt_programmed(pbpctl_dev, timeout); return wdt_programmed(pbpctl_dev, timeout);
} }
int get_wd_expire_time_fn(bpctl_dev_t *pbpctl_dev, int *time_left) int get_wd_expire_time_fn(struct bpctl_dev *pbpctl_dev, int *time_left)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4550,7 +4550,7 @@ int get_wd_expire_time_fn(bpctl_dev_t *pbpctl_dev, int *time_left) ...@@ -4550,7 +4550,7 @@ int get_wd_expire_time_fn(bpctl_dev_t *pbpctl_dev, int *time_left)
return wdt_timer(pbpctl_dev, time_left); return wdt_timer(pbpctl_dev, time_left);
} }
int reset_bypass_wd_timer_fn(bpctl_dev_t *pbpctl_dev) int reset_bypass_wd_timer_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4558,7 +4558,7 @@ int reset_bypass_wd_timer_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4558,7 +4558,7 @@ int reset_bypass_wd_timer_fn(bpctl_dev_t *pbpctl_dev)
return wdt_timer_reload(pbpctl_dev); return wdt_timer_reload(pbpctl_dev);
} }
int get_wd_set_caps_fn(bpctl_dev_t *pbpctl_dev) int get_wd_set_caps_fn(struct bpctl_dev *pbpctl_dev)
{ {
int bp_status = 0; int bp_status = 0;
...@@ -4582,7 +4582,7 @@ int get_wd_set_caps_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4582,7 +4582,7 @@ int get_wd_set_caps_fn(bpctl_dev_t *pbpctl_dev)
return bp_status; return bp_status;
} }
int set_std_nic_fn(bpctl_dev_t *pbpctl_dev, int nic_mode) int set_std_nic_fn(struct bpctl_dev *pbpctl_dev, int nic_mode)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4602,7 +4602,7 @@ int set_std_nic_fn(bpctl_dev_t *pbpctl_dev, int nic_mode) ...@@ -4602,7 +4602,7 @@ int set_std_nic_fn(bpctl_dev_t *pbpctl_dev, int nic_mode)
return ret; return ret;
} }
int get_std_nic_fn(bpctl_dev_t *pbpctl_dev) int get_std_nic_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4610,7 +4610,7 @@ int get_std_nic_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4610,7 +4610,7 @@ int get_std_nic_fn(bpctl_dev_t *pbpctl_dev)
return std_nic_status(pbpctl_dev); return std_nic_status(pbpctl_dev);
} }
int set_tap_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) int set_tap_fn(struct bpctl_dev *pbpctl_dev, int tap_mode)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4626,7 +4626,7 @@ int set_tap_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) ...@@ -4626,7 +4626,7 @@ int set_tap_fn(bpctl_dev_t *pbpctl_dev, int tap_mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_tap_fn(bpctl_dev_t *pbpctl_dev) int get_tap_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4634,7 +4634,7 @@ int get_tap_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4634,7 +4634,7 @@ int get_tap_fn(bpctl_dev_t *pbpctl_dev)
return tap_status(pbpctl_dev); return tap_status(pbpctl_dev);
} }
int set_tap_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) int set_tap_pwup_fn(struct bpctl_dev *pbpctl_dev, int tap_mode)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4652,7 +4652,7 @@ int set_tap_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) ...@@ -4652,7 +4652,7 @@ int set_tap_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode)
return ret; return ret;
} }
int get_tap_pwup_fn(bpctl_dev_t *pbpctl_dev) int get_tap_pwup_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4664,7 +4664,7 @@ int get_tap_pwup_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4664,7 +4664,7 @@ int get_tap_pwup_fn(bpctl_dev_t *pbpctl_dev)
return ((ret == 0) ? 1 : 0); return ((ret == 0) ? 1 : 0);
} }
int get_tap_change_fn(bpctl_dev_t *pbpctl_dev) int get_tap_change_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4672,7 +4672,7 @@ int get_tap_change_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4672,7 +4672,7 @@ int get_tap_change_fn(bpctl_dev_t *pbpctl_dev)
return tap_change_status(pbpctl_dev); return tap_change_status(pbpctl_dev);
} }
int set_dis_tap_fn(bpctl_dev_t *pbpctl_dev, int dis_param) int set_dis_tap_fn(struct bpctl_dev *pbpctl_dev, int dis_param)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4689,7 +4689,7 @@ int set_dis_tap_fn(bpctl_dev_t *pbpctl_dev, int dis_param) ...@@ -4689,7 +4689,7 @@ int set_dis_tap_fn(bpctl_dev_t *pbpctl_dev, int dis_param)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_dis_tap_fn(bpctl_dev_t *pbpctl_dev) int get_dis_tap_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4697,7 +4697,7 @@ int get_dis_tap_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4697,7 +4697,7 @@ int get_dis_tap_fn(bpctl_dev_t *pbpctl_dev)
return dis_tap_cap_status(pbpctl_dev); return dis_tap_cap_status(pbpctl_dev);
} }
int set_disc_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) int set_disc_fn(struct bpctl_dev *pbpctl_dev, int disc_mode)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4714,7 +4714,7 @@ int set_disc_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) ...@@ -4714,7 +4714,7 @@ int set_disc_fn(bpctl_dev_t *pbpctl_dev, int disc_mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_disc_fn(bpctl_dev_t *pbpctl_dev) int get_disc_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4725,7 +4725,7 @@ int get_disc_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4725,7 +4725,7 @@ int get_disc_fn(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int set_disc_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) int set_disc_pwup_fn(struct bpctl_dev *pbpctl_dev, int disc_mode)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4743,7 +4743,7 @@ int set_disc_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) ...@@ -4743,7 +4743,7 @@ int set_disc_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode)
return ret; return ret;
} }
int get_disc_pwup_fn(bpctl_dev_t *pbpctl_dev) int get_disc_pwup_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4753,7 +4753,7 @@ int get_disc_pwup_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4753,7 +4753,7 @@ int get_disc_pwup_fn(bpctl_dev_t *pbpctl_dev)
return (ret == 0 ? 1 : (ret < 0 ? BP_NOT_CAP : 0)); return (ret == 0 ? 1 : (ret < 0 ? BP_NOT_CAP : 0));
} }
int get_disc_change_fn(bpctl_dev_t *pbpctl_dev) int get_disc_change_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4763,7 +4763,7 @@ int get_disc_change_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4763,7 +4763,7 @@ int get_disc_change_fn(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int set_dis_disc_fn(bpctl_dev_t *pbpctl_dev, int dis_param) int set_dis_disc_fn(struct bpctl_dev *pbpctl_dev, int dis_param)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4781,7 +4781,7 @@ int set_dis_disc_fn(bpctl_dev_t *pbpctl_dev, int dis_param) ...@@ -4781,7 +4781,7 @@ int set_dis_disc_fn(bpctl_dev_t *pbpctl_dev, int dis_param)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_dis_disc_fn(bpctl_dev_t *pbpctl_dev) int get_dis_disc_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4792,7 +4792,7 @@ int get_dis_disc_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4792,7 +4792,7 @@ int get_dis_disc_fn(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int set_disc_port_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) int set_disc_port_fn(struct bpctl_dev *pbpctl_dev, int disc_mode)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4806,7 +4806,7 @@ int set_disc_port_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) ...@@ -4806,7 +4806,7 @@ int set_disc_port_fn(bpctl_dev_t *pbpctl_dev, int disc_mode)
return ret; return ret;
} }
int get_disc_port_fn(bpctl_dev_t *pbpctl_dev) int get_disc_port_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4814,7 +4814,7 @@ int get_disc_port_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4814,7 +4814,7 @@ int get_disc_port_fn(bpctl_dev_t *pbpctl_dev)
return disc_port_status(pbpctl_dev); return disc_port_status(pbpctl_dev);
} }
int set_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) int set_disc_port_pwup_fn(struct bpctl_dev *pbpctl_dev, int disc_mode)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4828,7 +4828,7 @@ int set_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode) ...@@ -4828,7 +4828,7 @@ int set_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev, int disc_mode)
return ret; return ret;
} }
int get_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev) int get_disc_port_pwup_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4840,7 +4840,7 @@ int get_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4840,7 +4840,7 @@ int get_disc_port_pwup_fn(bpctl_dev_t *pbpctl_dev)
return ((ret == 0) ? 1 : 0); return ((ret == 0) ? 1 : 0);
} }
int get_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev) int get_wd_exp_mode_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4848,7 +4848,7 @@ int get_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4848,7 +4848,7 @@ int get_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev)
return wdt_exp_mode_status(pbpctl_dev); return wdt_exp_mode_status(pbpctl_dev);
} }
int set_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev, int param) int set_wd_exp_mode_fn(struct bpctl_dev *pbpctl_dev, int param)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4856,7 +4856,7 @@ int set_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev, int param) ...@@ -4856,7 +4856,7 @@ int set_wd_exp_mode_fn(bpctl_dev_t *pbpctl_dev, int param)
return wdt_exp_mode(pbpctl_dev, param); return wdt_exp_mode(pbpctl_dev, param);
} }
int reset_cont_fn(bpctl_dev_t *pbpctl_dev) int reset_cont_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4868,10 +4868,10 @@ int reset_cont_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4868,10 +4868,10 @@ int reset_cont_fn(bpctl_dev_t *pbpctl_dev)
return reset_cont(pbpctl_dev); return reset_cont(pbpctl_dev);
} }
int set_tx_fn(bpctl_dev_t *pbpctl_dev, int tx_state) int set_tx_fn(struct bpctl_dev *pbpctl_dev, int tx_state)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4891,7 +4891,7 @@ int set_tx_fn(bpctl_dev_t *pbpctl_dev, int tx_state) ...@@ -4891,7 +4891,7 @@ int set_tx_fn(bpctl_dev_t *pbpctl_dev, int tx_state)
int set_bp_force_link_fn(int dev_num, int tx_state) int set_bp_force_link_fn(int dev_num, int tx_state)
{ {
static bpctl_dev_t *bpctl_dev_curr; static struct bpctl_dev *bpctl_dev_curr;
if ((dev_num < 0) || (dev_num > device_num) if ((dev_num < 0) || (dev_num > device_num)
|| (bpctl_dev_arr[dev_num].pdev == NULL)) || (bpctl_dev_arr[dev_num].pdev == NULL))
...@@ -4901,7 +4901,7 @@ int set_bp_force_link_fn(int dev_num, int tx_state) ...@@ -4901,7 +4901,7 @@ int set_bp_force_link_fn(int dev_num, int tx_state)
return set_bp_force_link(bpctl_dev_curr, tx_state); return set_bp_force_link(bpctl_dev_curr, tx_state);
} }
int set_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev, int param) int set_wd_autoreset_fn(struct bpctl_dev *pbpctl_dev, int param)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4909,7 +4909,7 @@ int set_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev, int param) ...@@ -4909,7 +4909,7 @@ int set_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev, int param)
return set_bypass_wd_auto(pbpctl_dev, param); return set_bypass_wd_auto(pbpctl_dev, param);
} }
int get_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev) int get_wd_autoreset_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4918,7 +4918,7 @@ int get_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4918,7 +4918,7 @@ int get_wd_autoreset_fn(bpctl_dev_t *pbpctl_dev)
} }
#ifdef BP_SELF_TEST #ifdef BP_SELF_TEST
int set_bp_self_test_fn(bpctl_dev_t *pbpctl_dev, int param) int set_bp_self_test_fn(struct bpctl_dev *pbpctl_dev, int param)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4926,7 +4926,7 @@ int set_bp_self_test_fn(bpctl_dev_t *pbpctl_dev, int param) ...@@ -4926,7 +4926,7 @@ int set_bp_self_test_fn(bpctl_dev_t *pbpctl_dev, int param)
return set_bp_self_test(pbpctl_dev, param); return set_bp_self_test(pbpctl_dev, param);
} }
int get_bp_self_test_fn(bpctl_dev_t *pbpctl_dev) int get_bp_self_test_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4936,7 +4936,7 @@ int get_bp_self_test_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4936,7 +4936,7 @@ int get_bp_self_test_fn(bpctl_dev_t *pbpctl_dev)
#endif #endif
int get_bypass_caps_fn(bpctl_dev_t *pbpctl_dev) int get_bypass_caps_fn(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4945,7 +4945,7 @@ int get_bypass_caps_fn(bpctl_dev_t *pbpctl_dev) ...@@ -4945,7 +4945,7 @@ int get_bypass_caps_fn(bpctl_dev_t *pbpctl_dev)
} }
int get_bypass_slave_fn(bpctl_dev_t *pbpctl_dev, bpctl_dev_t **pbpctl_dev_out) int get_bypass_slave_fn(struct bpctl_dev *pbpctl_dev, struct bpctl_dev **pbpctl_dev_out)
{ {
int idx_dev = 0; int idx_dev = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -4977,7 +4977,7 @@ int get_bypass_slave_fn(bpctl_dev_t *pbpctl_dev, bpctl_dev_t **pbpctl_dev_out) ...@@ -4977,7 +4977,7 @@ int get_bypass_slave_fn(bpctl_dev_t *pbpctl_dev, bpctl_dev_t **pbpctl_dev_out)
return 0; return 0;
} }
int is_bypass(bpctl_dev_t *pbpctl_dev) int is_bypass(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -4988,9 +4988,9 @@ int is_bypass(bpctl_dev_t *pbpctl_dev) ...@@ -4988,9 +4988,9 @@ int is_bypass(bpctl_dev_t *pbpctl_dev)
return 0; return 0;
} }
int get_tx_fn(bpctl_dev_t *pbpctl_dev) int get_tx_fn(struct bpctl_dev *pbpctl_dev)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5010,7 +5010,7 @@ int get_tx_fn(bpctl_dev_t *pbpctl_dev) ...@@ -5010,7 +5010,7 @@ int get_tx_fn(bpctl_dev_t *pbpctl_dev)
int get_bp_force_link_fn(int dev_num) int get_bp_force_link_fn(int dev_num)
{ {
static bpctl_dev_t *bpctl_dev_curr; static struct bpctl_dev *bpctl_dev_curr;
if ((dev_num < 0) || (dev_num > device_num) if ((dev_num < 0) || (dev_num > device_num)
|| (bpctl_dev_arr[dev_num].pdev == NULL)) || (bpctl_dev_arr[dev_num].pdev == NULL))
...@@ -5020,7 +5020,7 @@ int get_bp_force_link_fn(int dev_num) ...@@ -5020,7 +5020,7 @@ int get_bp_force_link_fn(int dev_num)
return bp_force_link_status(bpctl_dev_curr); return bp_force_link_status(bpctl_dev_curr);
} }
static int get_bypass_link_status(bpctl_dev_t *pbpctl_dev) static int get_bypass_link_status(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5036,9 +5036,9 @@ static int get_bypass_link_status(bpctl_dev_t *pbpctl_dev) ...@@ -5036,9 +5036,9 @@ static int get_bypass_link_status(bpctl_dev_t *pbpctl_dev)
static void bp_tpl_timer_fn(unsigned long param) static void bp_tpl_timer_fn(unsigned long param)
{ {
bpctl_dev_t *pbpctl_dev = (bpctl_dev_t *) param; struct bpctl_dev *pbpctl_dev = (struct bpctl_dev *) param;
uint32_t link1, link2; uint32_t link1, link2;
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
if (!pbpctl_dev_b) if (!pbpctl_dev_b)
...@@ -5071,9 +5071,9 @@ static void bp_tpl_timer_fn(unsigned long param) ...@@ -5071,9 +5071,9 @@ static void bp_tpl_timer_fn(unsigned long param)
mod_timer(&pbpctl_dev->bp_tpl_timer, jiffies + BP_LINK_MON_DELAY * HZ); mod_timer(&pbpctl_dev->bp_tpl_timer, jiffies + BP_LINK_MON_DELAY * HZ);
} }
void remove_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) void remove_bypass_tpl_auto(struct bpctl_dev *pbpctl_dev)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (!pbpctl_dev) if (!pbpctl_dev)
return; return;
pbpctl_dev_b = get_status_port_fn(pbpctl_dev); pbpctl_dev_b = get_status_port_fn(pbpctl_dev);
...@@ -5089,7 +5089,7 @@ void remove_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) ...@@ -5089,7 +5089,7 @@ void remove_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev)
return; return;
} }
int init_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) int init_bypass_tpl_auto(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5102,7 +5102,7 @@ int init_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) ...@@ -5102,7 +5102,7 @@ int init_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int set_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev, unsigned int param) int set_bypass_tpl_auto(struct bpctl_dev *pbpctl_dev, unsigned int param)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5120,7 +5120,7 @@ int set_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev, unsigned int param) ...@@ -5120,7 +5120,7 @@ int set_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev, unsigned int param)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) int get_bypass_tpl_auto(struct bpctl_dev *pbpctl_dev)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5130,10 +5130,10 @@ int get_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev) ...@@ -5130,10 +5130,10 @@ int get_bypass_tpl_auto(bpctl_dev_t *pbpctl_dev)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int set_tpl_fn(bpctl_dev_t *pbpctl_dev, int tpl_mode) int set_tpl_fn(struct bpctl_dev *pbpctl_dev, int tpl_mode)
{ {
bpctl_dev_t *pbpctl_dev_b = NULL; struct bpctl_dev *pbpctl_dev_b = NULL;
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5160,7 +5160,7 @@ int set_tpl_fn(bpctl_dev_t *pbpctl_dev, int tpl_mode) ...@@ -5160,7 +5160,7 @@ int set_tpl_fn(bpctl_dev_t *pbpctl_dev, int tpl_mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_tpl_fn(bpctl_dev_t *pbpctl_dev) int get_tpl_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = BP_NOT_CAP; int ret = BP_NOT_CAP;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -5174,7 +5174,7 @@ int get_tpl_fn(bpctl_dev_t *pbpctl_dev) ...@@ -5174,7 +5174,7 @@ int get_tpl_fn(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int set_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) int set_bp_wait_at_pwup_fn(struct bpctl_dev *pbpctl_dev, int tap_mode)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5194,7 +5194,7 @@ int set_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) ...@@ -5194,7 +5194,7 @@ int set_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev, int tap_mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev) int get_bp_wait_at_pwup_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -5207,7 +5207,7 @@ int get_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev) ...@@ -5207,7 +5207,7 @@ int get_bp_wait_at_pwup_fn(bpctl_dev_t *pbpctl_dev)
return ret; return ret;
} }
int set_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) int set_bp_hw_reset_fn(struct bpctl_dev *pbpctl_dev, int tap_mode)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
return -1; return -1;
...@@ -5227,7 +5227,7 @@ int set_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev, int tap_mode) ...@@ -5227,7 +5227,7 @@ int set_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev, int tap_mode)
return BP_NOT_CAP; return BP_NOT_CAP;
} }
int get_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev) int get_bp_hw_reset_fn(struct bpctl_dev *pbpctl_dev)
{ {
int ret = 0; int ret = 0;
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -5242,7 +5242,7 @@ int get_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev) ...@@ -5242,7 +5242,7 @@ int get_bp_hw_reset_fn(bpctl_dev_t *pbpctl_dev)
} }
int get_bypass_info_fn(bpctl_dev_t *pbpctl_dev, char *dev_name, int get_bypass_info_fn(struct bpctl_dev *pbpctl_dev, char *dev_name,
char *add_param) char *add_param)
{ {
if (!pbpctl_dev) if (!pbpctl_dev)
...@@ -5313,7 +5313,7 @@ static int get_dev_idx(int ifindex) ...@@ -5313,7 +5313,7 @@ static int get_dev_idx(int ifindex)
return -1; return -1;
} }
static bpctl_dev_t *get_dev_idx_p(int ifindex) static struct bpctl_dev *get_dev_idx_p(int ifindex)
{ {
int idx_dev = 0; int idx_dev = 0;
...@@ -5401,12 +5401,12 @@ static long device_ioctl(struct file *file, /* see include/linux/fs.h */ ...@@ -5401,12 +5401,12 @@ static long device_ioctl(struct file *file, /* see include/linux/fs.h */
{ {
struct bpctl_cmd bpctl_cmd; struct bpctl_cmd bpctl_cmd;
int dev_idx = 0; int dev_idx = 0;
bpctl_dev_t *pbpctl_dev_out; struct bpctl_dev *pbpctl_dev_out;
void __user *argp = (void __user *)ioctl_param; void __user *argp = (void __user *)ioctl_param;
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
static bpctl_dev_t *pbpctl_dev; static struct bpctl_dev *pbpctl_dev;
/* lock_kernel(); */ /* lock_kernel(); */
if (down_interruptible(&bpctl_sema)) if (down_interruptible(&bpctl_sema))
...@@ -6623,7 +6623,7 @@ static bpmod_info_t tx_ctl_pci_tbl[] = { ...@@ -6623,7 +6623,7 @@ static bpmod_info_t tx_ctl_pci_tbl[] = {
{0,} {0,}
}; };
static void find_fw(bpctl_dev_t *dev) static void find_fw(struct bpctl_dev *dev)
{ {
unsigned long mmio_start, mmio_len; unsigned long mmio_start, mmio_len;
struct pci_dev *pdev1 = dev->pdev; struct pci_dev *pdev1 = dev->pdev;
...@@ -6653,7 +6653,7 @@ static void find_fw(bpctl_dev_t *dev) ...@@ -6653,7 +6653,7 @@ static void find_fw(bpctl_dev_t *dev)
printk("firmware version: 0x%x\n", dev->bp_fw_ver); printk("firmware version: 0x%x\n", dev->bp_fw_ver);
} }
static int init_one(bpctl_dev_t *dev, bpmod_info_t *info, struct pci_dev *pdev1) static int init_one(struct bpctl_dev *dev, bpmod_info_t *info, struct pci_dev *pdev1)
{ {
unsigned long mmio_start, mmio_len; unsigned long mmio_start, mmio_len;
...@@ -6744,7 +6744,7 @@ static int __init bypass_init_module(void) ...@@ -6744,7 +6744,7 @@ static int __init bypass_init_module(void)
{ {
int ret_val, idx, idx_dev = 0; int ret_val, idx, idx_dev = 0;
struct pci_dev *pdev1 = NULL; struct pci_dev *pdev1 = NULL;
bpctl_dev_t *dev; struct bpctl_dev *dev;
printk(BP_MOD_DESCR " v" BP_MOD_VER "\n"); printk(BP_MOD_DESCR " v" BP_MOD_VER "\n");
ret_val = register_chrdev(major_num, DEVICE_NAME, &Fops); ret_val = register_chrdev(major_num, DEVICE_NAME, &Fops);
...@@ -6769,14 +6769,14 @@ static int __init bypass_init_module(void) ...@@ -6769,14 +6769,14 @@ static int __init bypass_init_module(void)
return -1; return -1;
} }
bpctl_dev_arr = kmalloc((device_num) * sizeof(bpctl_dev_t), GFP_KERNEL); bpctl_dev_arr = kmalloc((device_num) * sizeof(struct bpctl_dev), GFP_KERNEL);
if (!bpctl_dev_arr) { if (!bpctl_dev_arr) {
printk("Allocation error\n"); printk("Allocation error\n");
unregister_chrdev(major_num, DEVICE_NAME); unregister_chrdev(major_num, DEVICE_NAME);
return -1; return -1;
} }
memset(bpctl_dev_arr, 0, ((device_num) * sizeof(bpctl_dev_t))); memset(bpctl_dev_arr, 0, ((device_num) * sizeof(struct bpctl_dev)));
pdev1 = NULL; pdev1 = NULL;
dev = bpctl_dev_arr; dev = bpctl_dev_arr;
...@@ -6797,7 +6797,7 @@ static int __init bypass_init_module(void) ...@@ -6797,7 +6797,7 @@ static int __init bypass_init_module(void)
spin_lock_init(&bpvm_lock); spin_lock_init(&bpvm_lock);
{ {
bpctl_dev_t *pbpctl_dev_c = NULL; struct bpctl_dev *pbpctl_dev_c = NULL;
for (idx_dev = 0, dev = bpctl_dev_arr; for (idx_dev = 0, dev = bpctl_dev_arr;
idx_dev < device_num && dev->pdev; idx_dev < device_num && dev->pdev;
idx_dev++, dev++) { idx_dev++, dev++) {
...@@ -7169,7 +7169,7 @@ EXPORT_SYMBOL(get_bypass_caps_sd); ...@@ -7169,7 +7169,7 @@ EXPORT_SYMBOL(get_bypass_caps_sd);
int get_bypass_slave_sd(int ifindex) int get_bypass_slave_sd(int ifindex)
{ {
bpctl_dev_t *pbpctl_dev_out; struct bpctl_dev *pbpctl_dev_out;
int ret = get_bypass_slave_fn(get_dev_idx_p(ifindex), &pbpctl_dev_out); int ret = get_bypass_slave_fn(get_dev_idx_p(ifindex), &pbpctl_dev_out);
if (ret == 1) if (ret == 1)
return pbpctl_dev_out->ifindex; return pbpctl_dev_out->ifindex;
...@@ -7229,7 +7229,7 @@ int bp_proc_create(void) ...@@ -7229,7 +7229,7 @@ int bp_proc_create(void)
} }
static int procfs_add(char *proc_name, const struct file_operations *fops, static int procfs_add(char *proc_name, const struct file_operations *fops,
bpctl_dev_t *dev) struct bpctl_dev *dev)
{ {
struct bypass_pfs_sd *pfs = &dev->bypass_pfs_set; struct bypass_pfs_sd *pfs = &dev->bypass_pfs_set;
if (!proc_create_data(proc_name, 0644, pfs->bypass_entry, fops, dev)) if (!proc_create_data(proc_name, 0644, pfs->bypass_entry, fops, dev))
...@@ -7264,7 +7264,7 @@ static const struct file_operations name##_ops = { \ ...@@ -7264,7 +7264,7 @@ static const struct file_operations name##_ops = { \
static int show_bypass_info(struct seq_file *m, void *v) static int show_bypass_info(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
seq_printf(m, "Name\t\t\t%s\n", dev->name); seq_printf(m, "Name\t\t\t%s\n", dev->name);
seq_printf(m, "Firmware version\t0x%x\n", dev->bp_fw_ver); seq_printf(m, "Firmware version\t0x%x\n", dev->bp_fw_ver);
...@@ -7274,8 +7274,8 @@ RO_FOPS(bypass_info) ...@@ -7274,8 +7274,8 @@ RO_FOPS(bypass_info)
static int show_bypass_slave(struct seq_file *m, void *v) static int show_bypass_slave(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
bpctl_dev_t *slave = get_status_port_fn(dev); struct bpctl_dev *slave = get_status_port_fn(dev);
if (!slave) if (!slave)
slave = dev; slave = dev;
if (!slave) if (!slave)
...@@ -7288,7 +7288,7 @@ RO_FOPS(bypass_slave) ...@@ -7288,7 +7288,7 @@ RO_FOPS(bypass_slave)
static int show_bypass_caps(struct seq_file *m, void *v) static int show_bypass_caps(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bypass_caps_fn(dev); int ret = get_bypass_caps_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "-1\n"); seq_puts(m, "-1\n");
...@@ -7300,7 +7300,7 @@ RO_FOPS(bypass_caps) ...@@ -7300,7 +7300,7 @@ RO_FOPS(bypass_caps)
static int show_wd_set_caps(struct seq_file *m, void *v) static int show_wd_set_caps(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_wd_set_caps_fn(dev); int ret = get_wd_set_caps_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "-1\n"); seq_puts(m, "-1\n");
...@@ -7346,7 +7346,7 @@ static ssize_t bypass_write(struct file *file, const char __user *buffer, ...@@ -7346,7 +7346,7 @@ static ssize_t bypass_write(struct file *file, const char __user *buffer,
} }
static int show_bypass(struct seq_file *m, void *v) static int show_bypass(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bypass_fn(dev); int ret = get_bypass_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7370,7 +7370,7 @@ static ssize_t tap_write(struct file *file, const char __user *buffer, ...@@ -7370,7 +7370,7 @@ static ssize_t tap_write(struct file *file, const char __user *buffer,
} }
static int show_tap(struct seq_file *m, void *v) static int show_tap(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_tap_fn(dev); int ret = get_tap_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7394,7 +7394,7 @@ static ssize_t disc_write(struct file *file, const char __user *buffer, ...@@ -7394,7 +7394,7 @@ static ssize_t disc_write(struct file *file, const char __user *buffer,
} }
static int show_disc(struct seq_file *m, void *v) static int show_disc(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_disc_fn(dev); int ret = get_disc_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7408,7 +7408,7 @@ RW_FOPS(disc) ...@@ -7408,7 +7408,7 @@ RW_FOPS(disc)
static int show_bypass_change(struct seq_file *m, void *v) static int show_bypass_change(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bypass_change_fn(dev); int ret = get_bypass_change_fn(dev);
if (ret == 1) if (ret == 1)
seq_puts(m, "on\n"); seq_puts(m, "on\n");
...@@ -7422,7 +7422,7 @@ RO_FOPS(bypass_change) ...@@ -7422,7 +7422,7 @@ RO_FOPS(bypass_change)
static int show_tap_change(struct seq_file *m, void *v) static int show_tap_change(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_tap_change_fn(dev); int ret = get_tap_change_fn(dev);
if (ret == 1) if (ret == 1)
seq_puts(m, "on\n"); seq_puts(m, "on\n");
...@@ -7436,7 +7436,7 @@ RO_FOPS(tap_change) ...@@ -7436,7 +7436,7 @@ RO_FOPS(tap_change)
static int show_disc_change(struct seq_file *m, void *v) static int show_disc_change(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_disc_change_fn(dev); int ret = get_disc_change_fn(dev);
if (ret == 1) if (ret == 1)
seq_puts(m, "on\n"); seq_puts(m, "on\n");
...@@ -7451,7 +7451,7 @@ RO_FOPS(disc_change) ...@@ -7451,7 +7451,7 @@ RO_FOPS(disc_change)
static ssize_t bypass_wd_write(struct file *file, const char __user *buffer, static ssize_t bypass_wd_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
bpctl_dev_t *dev = PDE_DATA(file_inode(file)); struct bpctl_dev *dev = PDE_DATA(file_inode(file));
int timeout; int timeout;
int ret = kstrtoint_from_user(buffer, count, 10, &timeout); int ret = kstrtoint_from_user(buffer, count, 10, &timeout);
if (ret) if (ret)
...@@ -7461,7 +7461,7 @@ static ssize_t bypass_wd_write(struct file *file, const char __user *buffer, ...@@ -7461,7 +7461,7 @@ static ssize_t bypass_wd_write(struct file *file, const char __user *buffer,
} }
static int show_bypass_wd(struct seq_file *m, void *v) static int show_bypass_wd(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = 0, timeout = 0; int ret = 0, timeout = 0;
ret = get_bypass_wd_fn(dev, &timeout); ret = get_bypass_wd_fn(dev, &timeout);
...@@ -7479,7 +7479,7 @@ RW_FOPS(bypass_wd) ...@@ -7479,7 +7479,7 @@ RW_FOPS(bypass_wd)
static int show_wd_expire_time(struct seq_file *m, void *v) static int show_wd_expire_time(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = 0, timeout = 0; int ret = 0, timeout = 0;
ret = get_wd_expire_time_fn(dev, &timeout); ret = get_wd_expire_time_fn(dev, &timeout);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
...@@ -7497,7 +7497,7 @@ RO_FOPS(wd_expire_time) ...@@ -7497,7 +7497,7 @@ RO_FOPS(wd_expire_time)
static ssize_t tpl_write(struct file *file, const char __user *buffer, static ssize_t tpl_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
bpctl_dev_t *dev = PDE_DATA(file_inode(file)); struct bpctl_dev *dev = PDE_DATA(file_inode(file));
int tpl_param = user_on_off(buffer, count); int tpl_param = user_on_off(buffer, count);
if (tpl_param < 0) if (tpl_param < 0)
return -1; return -1;
...@@ -7507,7 +7507,7 @@ static ssize_t tpl_write(struct file *file, const char __user *buffer, ...@@ -7507,7 +7507,7 @@ static ssize_t tpl_write(struct file *file, const char __user *buffer,
} }
static int show_tpl(struct seq_file *m, void *v) static int show_tpl(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_tpl_fn(dev); int ret = get_tpl_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7523,7 +7523,7 @@ RW_FOPS(tpl) ...@@ -7523,7 +7523,7 @@ RW_FOPS(tpl)
static ssize_t wait_at_pwup_write(struct file *file, const char __user *buffer, static ssize_t wait_at_pwup_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
bpctl_dev_t *dev = PDE_DATA(file_inode(file)); struct bpctl_dev *dev = PDE_DATA(file_inode(file));
int tpl_param = user_on_off(buffer, count); int tpl_param = user_on_off(buffer, count);
if (tpl_param < 0) if (tpl_param < 0)
return -1; return -1;
...@@ -7533,7 +7533,7 @@ static ssize_t wait_at_pwup_write(struct file *file, const char __user *buffer, ...@@ -7533,7 +7533,7 @@ static ssize_t wait_at_pwup_write(struct file *file, const char __user *buffer,
} }
static int show_wait_at_pwup(struct seq_file *m, void *v) static int show_wait_at_pwup(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bp_wait_at_pwup_fn(dev); int ret = get_bp_wait_at_pwup_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7548,7 +7548,7 @@ RW_FOPS(wait_at_pwup) ...@@ -7548,7 +7548,7 @@ RW_FOPS(wait_at_pwup)
static ssize_t hw_reset_write(struct file *file, const char __user *buffer, static ssize_t hw_reset_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos) size_t count, loff_t *pos)
{ {
bpctl_dev_t *dev = PDE_DATA(file_inode(file)); struct bpctl_dev *dev = PDE_DATA(file_inode(file));
int tpl_param = user_on_off(buffer, count); int tpl_param = user_on_off(buffer, count);
if (tpl_param < 0) if (tpl_param < 0)
return -1; return -1;
...@@ -7558,7 +7558,7 @@ static ssize_t hw_reset_write(struct file *file, const char __user *buffer, ...@@ -7558,7 +7558,7 @@ static ssize_t hw_reset_write(struct file *file, const char __user *buffer,
} }
static int show_hw_reset(struct seq_file *m, void *v) static int show_hw_reset(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bp_hw_reset_fn(dev); int ret = get_bp_hw_reset_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7574,7 +7574,7 @@ RW_FOPS(hw_reset) ...@@ -7574,7 +7574,7 @@ RW_FOPS(hw_reset)
static int show_reset_bypass_wd(struct seq_file *m, void *v) static int show_reset_bypass_wd(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = reset_bypass_wd_timer_fn(dev); int ret = reset_bypass_wd_timer_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7598,7 +7598,7 @@ static ssize_t dis_bypass_write(struct file *file, const char __user *buffer, ...@@ -7598,7 +7598,7 @@ static ssize_t dis_bypass_write(struct file *file, const char __user *buffer,
} }
static int show_dis_bypass(struct seq_file *m, void *v) static int show_dis_bypass(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_dis_bypass_fn(dev); int ret = get_dis_bypass_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7622,7 +7622,7 @@ static ssize_t dis_tap_write(struct file *file, const char __user *buffer, ...@@ -7622,7 +7622,7 @@ static ssize_t dis_tap_write(struct file *file, const char __user *buffer,
} }
static int show_dis_tap(struct seq_file *m, void *v) static int show_dis_tap(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_dis_tap_fn(dev); int ret = get_dis_tap_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7646,7 +7646,7 @@ static ssize_t dis_disc_write(struct file *file, const char __user *buffer, ...@@ -7646,7 +7646,7 @@ static ssize_t dis_disc_write(struct file *file, const char __user *buffer,
} }
static int show_dis_disc(struct seq_file *m, void *v) static int show_dis_disc(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_dis_disc_fn(dev); int ret = get_dis_disc_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7670,7 +7670,7 @@ static ssize_t bypass_pwup_write(struct file *file, const char __user *buffer, ...@@ -7670,7 +7670,7 @@ static ssize_t bypass_pwup_write(struct file *file, const char __user *buffer,
} }
static int show_bypass_pwup(struct seq_file *m, void *v) static int show_bypass_pwup(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bypass_pwup_fn(dev); int ret = get_bypass_pwup_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7694,7 +7694,7 @@ static ssize_t bypass_pwoff_write(struct file *file, const char __user *buffer, ...@@ -7694,7 +7694,7 @@ static ssize_t bypass_pwoff_write(struct file *file, const char __user *buffer,
} }
static int show_bypass_pwoff(struct seq_file *m, void *v) static int show_bypass_pwoff(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_bypass_pwoff_fn(dev); int ret = get_bypass_pwoff_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7718,7 +7718,7 @@ static ssize_t tap_pwup_write(struct file *file, const char __user *buffer, ...@@ -7718,7 +7718,7 @@ static ssize_t tap_pwup_write(struct file *file, const char __user *buffer,
} }
static int show_tap_pwup(struct seq_file *m, void *v) static int show_tap_pwup(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_tap_pwup_fn(dev); int ret = get_tap_pwup_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7742,7 +7742,7 @@ static ssize_t disc_pwup_write(struct file *file, const char __user *buffer, ...@@ -7742,7 +7742,7 @@ static ssize_t disc_pwup_write(struct file *file, const char __user *buffer,
} }
static int show_disc_pwup(struct seq_file *m, void *v) static int show_disc_pwup(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_disc_pwup_fn(dev); int ret = get_disc_pwup_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7766,7 +7766,7 @@ static ssize_t std_nic_write(struct file *file, const char __user *buffer, ...@@ -7766,7 +7766,7 @@ static ssize_t std_nic_write(struct file *file, const char __user *buffer,
} }
static int show_std_nic(struct seq_file *m, void *v) static int show_std_nic(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_std_nic_fn(dev); int ret = get_std_nic_fn(dev);
if (ret == BP_NOT_CAP) if (ret == BP_NOT_CAP)
seq_puts(m, "fail\n"); seq_puts(m, "fail\n");
...@@ -7808,7 +7808,7 @@ static ssize_t wd_exp_mode_write(struct file *file, const char __user *buffer, ...@@ -7808,7 +7808,7 @@ static ssize_t wd_exp_mode_write(struct file *file, const char __user *buffer,
} }
static int show_wd_exp_mode(struct seq_file *m, void *v) static int show_wd_exp_mode(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_wd_exp_mode_fn(dev); int ret = get_wd_exp_mode_fn(dev);
if (ret == 1) if (ret == 1)
seq_puts(m, "tap\n"); seq_puts(m, "tap\n");
...@@ -7834,7 +7834,7 @@ static ssize_t wd_autoreset_write(struct file *file, const char __user *buffer, ...@@ -7834,7 +7834,7 @@ static ssize_t wd_autoreset_write(struct file *file, const char __user *buffer,
} }
static int show_wd_autoreset(struct seq_file *m, void *v) static int show_wd_autoreset(struct seq_file *m, void *v)
{ {
bpctl_dev_t *dev = m->private; struct bpctl_dev *dev = m->private;
int ret = get_wd_autoreset_fn(dev); int ret = get_wd_autoreset_fn(dev);
if (ret >= 0) if (ret >= 0)
seq_printf(m, "%d\n", ret); seq_printf(m, "%d\n", ret);
...@@ -7844,7 +7844,7 @@ static int show_wd_autoreset(struct seq_file *m, void *v) ...@@ -7844,7 +7844,7 @@ static int show_wd_autoreset(struct seq_file *m, void *v)
} }
RW_FOPS(wd_autoreset) RW_FOPS(wd_autoreset)
int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block) int bypass_proc_create_dev_sd(struct bpctl_dev *pbp_device_block)
{ {
struct bypass_pfs_sd *current_pfs = &(pbp_device_block->bypass_pfs_set); struct bypass_pfs_sd *current_pfs = &(pbp_device_block->bypass_pfs_set);
static struct proc_dir_entry *procfs_dir; static struct proc_dir_entry *procfs_dir;
...@@ -7914,7 +7914,7 @@ int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block) ...@@ -7914,7 +7914,7 @@ int bypass_proc_create_dev_sd(bpctl_dev_t *pbp_device_block)
return ret; return ret;
} }
int bypass_proc_remove_dev_sd(bpctl_dev_t *pbp_device_block) int bypass_proc_remove_dev_sd(struct bpctl_dev *pbp_device_block)
{ {
struct bypass_pfs_sd *current_pfs = &pbp_device_block->bypass_pfs_set; struct bypass_pfs_sd *current_pfs = &pbp_device_block->bypass_pfs_set;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7