diff options
author | Jing Huang <huangj@brocade.com> | 2010-10-18 20:08:54 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-25 17:15:58 -0400 |
commit | 6a18b1675fdf08a6dc861e39c3f94309a03e7f16 (patch) | |
tree | 0437af49a6e9edc1ce87e2ee85962c4ff24c7a48 /drivers/scsi/bfa/bfa_ioc.c | |
parent | 156606768cc234146e21fa6ba6316dbc67a204dd (diff) |
[SCSI] bfa: remove os wrapper and unused functions
This patch removes os wrapper and unused functions.
bfa_os_assign(), bfa_os_memset(), bfa_os_memcpy(), bfa_os_udelay()
bfa_os_vsprintf(), bfa_os_snprintf(), and bfa_os_get_clock() are replaced with
direct assignment or native linux functions. Some unused functions related to VF
(Vitual fabric) are also removed.
Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bfa/bfa_ioc.c')
-rw-r--r-- | drivers/scsi/bfa/bfa_ioc.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c index 6795b247791a..bd25fc2c874b 100644 --- a/drivers/scsi/bfa/bfa_ioc.c +++ b/drivers/scsi/bfa/bfa_ioc.c | |||
@@ -1133,7 +1133,7 @@ bfa_ioc_sem_get(bfa_os_addr_t sem_reg) | |||
1133 | 1133 | ||
1134 | while (r32 && (cnt < BFA_SEM_SPINCNT)) { | 1134 | while (r32 && (cnt < BFA_SEM_SPINCNT)) { |
1135 | cnt++; | 1135 | cnt++; |
1136 | bfa_os_udelay(2); | 1136 | udelay(2); |
1137 | r32 = bfa_reg_read(sem_reg); | 1137 | r32 = bfa_reg_read(sem_reg); |
1138 | } | 1138 | } |
1139 | 1139 | ||
@@ -2293,7 +2293,7 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc_s *ioc, | |||
2293 | bfa_ioc_get_adapter_fw_ver(ioc, ad_attr->fw_ver); | 2293 | bfa_ioc_get_adapter_fw_ver(ioc, ad_attr->fw_ver); |
2294 | bfa_ioc_get_adapter_optrom_ver(ioc, ad_attr->optrom_ver); | 2294 | bfa_ioc_get_adapter_optrom_ver(ioc, ad_attr->optrom_ver); |
2295 | bfa_ioc_get_adapter_manufacturer(ioc, ad_attr->manufacturer); | 2295 | bfa_ioc_get_adapter_manufacturer(ioc, ad_attr->manufacturer); |
2296 | bfa_os_memcpy(&ad_attr->vpd, &ioc_attr->vpd, | 2296 | memcpy(&ad_attr->vpd, &ioc_attr->vpd, |
2297 | sizeof(struct bfa_mfg_vpd_s)); | 2297 | sizeof(struct bfa_mfg_vpd_s)); |
2298 | 2298 | ||
2299 | ad_attr->nports = bfa_ioc_get_nports(ioc); | 2299 | ad_attr->nports = bfa_ioc_get_nports(ioc); |
@@ -2343,8 +2343,8 @@ bfa_ioc_get_type(struct bfa_ioc_s *ioc) | |||
2343 | void | 2343 | void |
2344 | bfa_ioc_get_adapter_serial_num(struct bfa_ioc_s *ioc, char *serial_num) | 2344 | bfa_ioc_get_adapter_serial_num(struct bfa_ioc_s *ioc, char *serial_num) |
2345 | { | 2345 | { |
2346 | bfa_os_memset((void *)serial_num, 0, BFA_ADAPTER_SERIAL_NUM_LEN); | 2346 | memset((void *)serial_num, 0, BFA_ADAPTER_SERIAL_NUM_LEN); |
2347 | bfa_os_memcpy((void *)serial_num, | 2347 | memcpy((void *)serial_num, |
2348 | (void *)ioc->attr->brcd_serialnum, | 2348 | (void *)ioc->attr->brcd_serialnum, |
2349 | BFA_ADAPTER_SERIAL_NUM_LEN); | 2349 | BFA_ADAPTER_SERIAL_NUM_LEN); |
2350 | } | 2350 | } |
@@ -2352,8 +2352,8 @@ bfa_ioc_get_adapter_serial_num(struct bfa_ioc_s *ioc, char *serial_num) | |||
2352 | void | 2352 | void |
2353 | bfa_ioc_get_adapter_fw_ver(struct bfa_ioc_s *ioc, char *fw_ver) | 2353 | bfa_ioc_get_adapter_fw_ver(struct bfa_ioc_s *ioc, char *fw_ver) |
2354 | { | 2354 | { |
2355 | bfa_os_memset((void *)fw_ver, 0, BFA_VERSION_LEN); | 2355 | memset((void *)fw_ver, 0, BFA_VERSION_LEN); |
2356 | bfa_os_memcpy(fw_ver, ioc->attr->fw_version, BFA_VERSION_LEN); | 2356 | memcpy(fw_ver, ioc->attr->fw_version, BFA_VERSION_LEN); |
2357 | } | 2357 | } |
2358 | 2358 | ||
2359 | void | 2359 | void |
@@ -2361,7 +2361,7 @@ bfa_ioc_get_pci_chip_rev(struct bfa_ioc_s *ioc, char *chip_rev) | |||
2361 | { | 2361 | { |
2362 | bfa_assert(chip_rev); | 2362 | bfa_assert(chip_rev); |
2363 | 2363 | ||
2364 | bfa_os_memset((void *)chip_rev, 0, BFA_IOC_CHIP_REV_LEN); | 2364 | memset((void *)chip_rev, 0, BFA_IOC_CHIP_REV_LEN); |
2365 | 2365 | ||
2366 | chip_rev[0] = 'R'; | 2366 | chip_rev[0] = 'R'; |
2367 | chip_rev[1] = 'e'; | 2367 | chip_rev[1] = 'e'; |
@@ -2374,16 +2374,16 @@ bfa_ioc_get_pci_chip_rev(struct bfa_ioc_s *ioc, char *chip_rev) | |||
2374 | void | 2374 | void |
2375 | bfa_ioc_get_adapter_optrom_ver(struct bfa_ioc_s *ioc, char *optrom_ver) | 2375 | bfa_ioc_get_adapter_optrom_ver(struct bfa_ioc_s *ioc, char *optrom_ver) |
2376 | { | 2376 | { |
2377 | bfa_os_memset((void *)optrom_ver, 0, BFA_VERSION_LEN); | 2377 | memset((void *)optrom_ver, 0, BFA_VERSION_LEN); |
2378 | bfa_os_memcpy(optrom_ver, ioc->attr->optrom_version, | 2378 | memcpy(optrom_ver, ioc->attr->optrom_version, |
2379 | BFA_VERSION_LEN); | 2379 | BFA_VERSION_LEN); |
2380 | } | 2380 | } |
2381 | 2381 | ||
2382 | void | 2382 | void |
2383 | bfa_ioc_get_adapter_manufacturer(struct bfa_ioc_s *ioc, char *manufacturer) | 2383 | bfa_ioc_get_adapter_manufacturer(struct bfa_ioc_s *ioc, char *manufacturer) |
2384 | { | 2384 | { |
2385 | bfa_os_memset((void *)manufacturer, 0, BFA_ADAPTER_MFG_NAME_LEN); | 2385 | memset((void *)manufacturer, 0, BFA_ADAPTER_MFG_NAME_LEN); |
2386 | bfa_os_memcpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN); | 2386 | memcpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN); |
2387 | } | 2387 | } |
2388 | 2388 | ||
2389 | void | 2389 | void |
@@ -2392,14 +2392,14 @@ bfa_ioc_get_adapter_model(struct bfa_ioc_s *ioc, char *model) | |||
2392 | struct bfi_ioc_attr_s *ioc_attr; | 2392 | struct bfi_ioc_attr_s *ioc_attr; |
2393 | 2393 | ||
2394 | bfa_assert(model); | 2394 | bfa_assert(model); |
2395 | bfa_os_memset((void *)model, 0, BFA_ADAPTER_MODEL_NAME_LEN); | 2395 | memset((void *)model, 0, BFA_ADAPTER_MODEL_NAME_LEN); |
2396 | 2396 | ||
2397 | ioc_attr = ioc->attr; | 2397 | ioc_attr = ioc->attr; |
2398 | 2398 | ||
2399 | /** | 2399 | /** |
2400 | * model name | 2400 | * model name |
2401 | */ | 2401 | */ |
2402 | bfa_os_snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", | 2402 | snprintf(model, BFA_ADAPTER_MODEL_NAME_LEN, "%s-%u", |
2403 | BFA_MFG_NAME, ioc_attr->card_type); | 2403 | BFA_MFG_NAME, ioc_attr->card_type); |
2404 | } | 2404 | } |
2405 | 2405 | ||
@@ -2446,7 +2446,7 @@ bfa_ioc_get_state(struct bfa_ioc_s *ioc) | |||
2446 | void | 2446 | void |
2447 | bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr) | 2447 | bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr) |
2448 | { | 2448 | { |
2449 | bfa_os_memset((void *)ioc_attr, 0, sizeof(struct bfa_ioc_attr_s)); | 2449 | memset((void *)ioc_attr, 0, sizeof(struct bfa_ioc_attr_s)); |
2450 | 2450 | ||
2451 | ioc_attr->state = bfa_ioc_get_state(ioc); | 2451 | ioc_attr->state = bfa_ioc_get_state(ioc); |
2452 | ioc_attr->port_id = ioc->port_id; | 2452 | ioc_attr->port_id = ioc->port_id; |
@@ -2541,7 +2541,7 @@ bfa_ioc_debug_fwsave(struct bfa_ioc_s *ioc, void *trcdata, int *trclen) | |||
2541 | if (tlen > ioc->dbg_fwsave_len) | 2541 | if (tlen > ioc->dbg_fwsave_len) |
2542 | tlen = ioc->dbg_fwsave_len; | 2542 | tlen = ioc->dbg_fwsave_len; |
2543 | 2543 | ||
2544 | bfa_os_memcpy(trcdata, ioc->dbg_fwsave, tlen); | 2544 | memcpy(trcdata, ioc->dbg_fwsave, tlen); |
2545 | *trclen = tlen; | 2545 | *trclen = tlen; |
2546 | return BFA_STATUS_OK; | 2546 | return BFA_STATUS_OK; |
2547 | } | 2547 | } |