diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-03-02 15:18:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 19:48:02 -0500 |
commit | 5508d82488694e3d427345d624687a3fa9fb9a88 (patch) | |
tree | 882458703376a17bb371c00b7ed7a9eb245af364 | |
parent | 810acd19a4cd1e29d910f8a7eea8bcc168de00cd (diff) |
staging: brcm80211: remove struct osl_info usage from phy sources
Getting rid of osl concept taking small steps. This commit removes
it from source files in brcm80211/brcmsmac/phy directory.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
4 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c index 35b43677d21..bb49a0cd0b0 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | |||
@@ -275,13 +275,9 @@ u16 read_radio_reg(phy_info_t *pi, u16 addr) | |||
275 | 275 | ||
276 | void write_radio_reg(phy_info_t *pi, u16 addr, u16 val) | 276 | void write_radio_reg(phy_info_t *pi, u16 addr, u16 val) |
277 | { | 277 | { |
278 | struct osl_info *osh; | ||
279 | |||
280 | if (NORADIO_ENAB(pi->pubpi)) | 278 | if (NORADIO_ENAB(pi->pubpi)) |
281 | return; | 279 | return; |
282 | 280 | ||
283 | osh = pi->sh->osh; | ||
284 | |||
285 | if ((D11REV_GE(pi->sh->corerev, 24)) || | 281 | if ((D11REV_GE(pi->sh->corerev, 24)) || |
286 | (D11REV_IS(pi->sh->corerev, 22) | 282 | (D11REV_IS(pi->sh->corerev, 22) |
287 | && (pi->pubpi.phy_type != PHY_TYPE_SSN))) { | 283 | && (pi->pubpi.phy_type != PHY_TYPE_SSN))) { |
@@ -408,10 +404,8 @@ static bool wlc_phy_war41476(phy_info_t *pi) | |||
408 | 404 | ||
409 | u16 read_phy_reg(phy_info_t *pi, u16 addr) | 405 | u16 read_phy_reg(phy_info_t *pi, u16 addr) |
410 | { | 406 | { |
411 | struct osl_info *osh; | ||
412 | d11regs_t *regs; | 407 | d11regs_t *regs; |
413 | 408 | ||
414 | osh = pi->sh->osh; | ||
415 | regs = pi->regs; | 409 | regs = pi->regs; |
416 | 410 | ||
417 | W_REG(®s->phyregaddr, addr); | 411 | W_REG(®s->phyregaddr, addr); |
@@ -429,10 +423,8 @@ u16 read_phy_reg(phy_info_t *pi, u16 addr) | |||
429 | 423 | ||
430 | void write_phy_reg(phy_info_t *pi, u16 addr, u16 val) | 424 | void write_phy_reg(phy_info_t *pi, u16 addr, u16 val) |
431 | { | 425 | { |
432 | struct osl_info *osh; | ||
433 | d11regs_t *regs; | 426 | d11regs_t *regs; |
434 | 427 | ||
435 | osh = pi->sh->osh; | ||
436 | regs = pi->regs; | 428 | regs = pi->regs; |
437 | 429 | ||
438 | #ifdef __mips__ | 430 | #ifdef __mips__ |
@@ -455,10 +447,8 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val) | |||
455 | 447 | ||
456 | void and_phy_reg(phy_info_t *pi, u16 addr, u16 val) | 448 | void and_phy_reg(phy_info_t *pi, u16 addr, u16 val) |
457 | { | 449 | { |
458 | struct osl_info *osh; | ||
459 | d11regs_t *regs; | 450 | d11regs_t *regs; |
460 | 451 | ||
461 | osh = pi->sh->osh; | ||
462 | regs = pi->regs; | 452 | regs = pi->regs; |
463 | 453 | ||
464 | W_REG(®s->phyregaddr, addr); | 454 | W_REG(®s->phyregaddr, addr); |
@@ -476,10 +466,8 @@ void and_phy_reg(phy_info_t *pi, u16 addr, u16 val) | |||
476 | 466 | ||
477 | void or_phy_reg(phy_info_t *pi, u16 addr, u16 val) | 467 | void or_phy_reg(phy_info_t *pi, u16 addr, u16 val) |
478 | { | 468 | { |
479 | struct osl_info *osh; | ||
480 | d11regs_t *regs; | 469 | d11regs_t *regs; |
481 | 470 | ||
482 | osh = pi->sh->osh; | ||
483 | regs = pi->regs; | 471 | regs = pi->regs; |
484 | 472 | ||
485 | W_REG(®s->phyregaddr, addr); | 473 | W_REG(®s->phyregaddr, addr); |
@@ -497,10 +485,8 @@ void or_phy_reg(phy_info_t *pi, u16 addr, u16 val) | |||
497 | 485 | ||
498 | void mod_phy_reg(phy_info_t *pi, u16 addr, u16 mask, u16 val) | 486 | void mod_phy_reg(phy_info_t *pi, u16 addr, u16 mask, u16 val) |
499 | { | 487 | { |
500 | struct osl_info *osh; | ||
501 | d11regs_t *regs; | 488 | d11regs_t *regs; |
502 | 489 | ||
503 | osh = pi->sh->osh; | ||
504 | regs = pi->regs; | 490 | regs = pi->regs; |
505 | 491 | ||
506 | W_REG(®s->phyregaddr, addr); | 492 | W_REG(®s->phyregaddr, addr); |
@@ -563,7 +549,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) | |||
563 | return NULL; | 549 | return NULL; |
564 | } | 550 | } |
565 | 551 | ||
566 | sh->osh = shp->osh; | ||
567 | sh->sih = shp->sih; | 552 | sh->sih = shp->sih; |
568 | sh->physhim = shp->physhim; | 553 | sh->physhim = shp->physhim; |
569 | sh->unit = shp->unit; | 554 | sh->unit = shp->unit; |
@@ -594,11 +579,7 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) | |||
594 | 579 | ||
595 | void wlc_phy_shared_detach(shared_phy_t *phy_sh) | 580 | void wlc_phy_shared_detach(shared_phy_t *phy_sh) |
596 | { | 581 | { |
597 | struct osl_info *osh; | ||
598 | |||
599 | if (phy_sh) { | 582 | if (phy_sh) { |
600 | osh = phy_sh->osh; | ||
601 | |||
602 | if (phy_sh->phy_head) { | 583 | if (phy_sh->phy_head) { |
603 | ASSERT(!phy_sh->phy_head); | 584 | ASSERT(!phy_sh->phy_head); |
604 | } | 585 | } |
@@ -612,9 +593,6 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars | |||
612 | u32 sflags = 0; | 593 | u32 sflags = 0; |
613 | uint phyversion; | 594 | uint phyversion; |
614 | int i; | 595 | int i; |
615 | struct osl_info *osh; | ||
616 | |||
617 | osh = sh->osh; | ||
618 | 596 | ||
619 | if (D11REV_IS(sh->corerev, 4)) | 597 | if (D11REV_IS(sh->corerev, 4)) |
620 | sflags = SISF_2G_PHY | SISF_5G_PHY; | 598 | sflags = SISF_2G_PHY | SISF_5G_PHY; |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h index 514e15e0028..bf962d5b339 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | |||
@@ -125,7 +125,6 @@ struct phy_pub; | |||
125 | typedef struct phy_pub wlc_phy_t; | 125 | typedef struct phy_pub wlc_phy_t; |
126 | 126 | ||
127 | typedef struct shared_phy_params { | 127 | typedef struct shared_phy_params { |
128 | void *osh; | ||
129 | si_t *sih; | 128 | si_t *sih; |
130 | void *physhim; | 129 | void *physhim; |
131 | uint unit; | 130 | uint unit; |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h index 0530b1ddb3c..6e12a95c736 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | |||
@@ -527,7 +527,6 @@ typedef struct { | |||
527 | struct shared_phy { | 527 | struct shared_phy { |
528 | struct phy_info *phy_head; | 528 | struct phy_info *phy_head; |
529 | uint unit; | 529 | uint unit; |
530 | struct osl_info *osh; | ||
531 | si_t *sih; | 530 | si_t *sih; |
532 | void *physhim; | 531 | void *physhim; |
533 | uint corerev; | 532 | uint corerev; |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index 6ec0ab79980..ca12d260279 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | |||
@@ -805,7 +805,6 @@ int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device, uint unit, | |||
805 | } | 805 | } |
806 | 806 | ||
807 | /* pass all the parameters to wlc_phy_shared_attach in one struct */ | 807 | /* pass all the parameters to wlc_phy_shared_attach in one struct */ |
808 | sha_params.osh = wlc->osh; | ||
809 | sha_params.sih = wlc_hw->sih; | 808 | sha_params.sih = wlc_hw->sih; |
810 | sha_params.physhim = wlc_hw->physhim; | 809 | sha_params.physhim = wlc_hw->physhim; |
811 | sha_params.unit = unit; | 810 | sha_params.unit = unit; |