diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 09:16:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:16:48 -0400 |
commit | ed1dd81464f53314b5d93924adb84de9cd5838a5 (patch) | |
tree | bb133c68b5a16f4def22f8c2f8e7bfee7a62130b /drivers/net/wireless/brcm80211 | |
parent | 72d4d66205a7e033fa56755ff3f81ab17d952df9 (diff) |
brcmsmac: use container_of instead of cast
Now "struct si_pub pub" does not have to be the first member in struct
si_info any more, if it is the resulting code after compilation should
be the same.
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c index 339e5337135..2a7769854bc 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | |||
@@ -582,7 +582,7 @@ void ai_detach(struct si_pub *sih) | |||
582 | struct si_pub *si_local = NULL; | 582 | struct si_pub *si_local = NULL; |
583 | memcpy(&si_local, &sih, sizeof(struct si_pub **)); | 583 | memcpy(&si_local, &sih, sizeof(struct si_pub **)); |
584 | 584 | ||
585 | sii = (struct si_info *)sih; | 585 | sii = container_of(sih, struct si_info, pub); |
586 | 586 | ||
587 | if (sii == NULL) | 587 | if (sii == NULL) |
588 | return; | 588 | return; |
@@ -597,7 +597,7 @@ struct bcma_device *ai_findcore(struct si_pub *sih, u16 coreid, u16 coreunit) | |||
597 | struct si_info *sii; | 597 | struct si_info *sii; |
598 | uint found; | 598 | uint found; |
599 | 599 | ||
600 | sii = (struct si_info *)sih; | 600 | sii = container_of(sih, struct si_info, pub); |
601 | 601 | ||
602 | found = 0; | 602 | found = 0; |
603 | 603 | ||
@@ -620,7 +620,7 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val) | |||
620 | u32 w; | 620 | u32 w; |
621 | struct si_info *sii; | 621 | struct si_info *sii; |
622 | 622 | ||
623 | sii = (struct si_info *)sih; | 623 | sii = container_of(sih, struct si_info, pub); |
624 | cc = sii->icbus->drv_cc.core; | 624 | cc = sii->icbus->drv_cc.core; |
625 | 625 | ||
626 | /* mask and set */ | 626 | /* mask and set */ |
@@ -713,7 +713,7 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih) | |||
713 | uint slowminfreq; | 713 | uint slowminfreq; |
714 | u16 fpdelay; | 714 | u16 fpdelay; |
715 | 715 | ||
716 | sii = (struct si_info *)sih; | 716 | sii = container_of(sih, struct si_info, pub); |
717 | if (ai_get_cccaps(sih) & CC_CAP_PMU) { | 717 | if (ai_get_cccaps(sih) & CC_CAP_PMU) { |
718 | fpdelay = si_pmu_fast_pwrup_delay(sih); | 718 | fpdelay = si_pmu_fast_pwrup_delay(sih); |
719 | return fpdelay; | 719 | return fpdelay; |
@@ -745,7 +745,7 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode) | |||
745 | struct si_info *sii; | 745 | struct si_info *sii; |
746 | struct bcma_device *cc; | 746 | struct bcma_device *cc; |
747 | 747 | ||
748 | sii = (struct si_info *)sih; | 748 | sii = container_of(sih, struct si_info, pub); |
749 | 749 | ||
750 | cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0); | 750 | cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0); |
751 | bcma_core_set_clockmode(cc, mode); | 751 | bcma_core_set_clockmode(cc, mode); |
@@ -756,7 +756,7 @@ void ai_pci_up(struct si_pub *sih) | |||
756 | { | 756 | { |
757 | struct si_info *sii; | 757 | struct si_info *sii; |
758 | 758 | ||
759 | sii = (struct si_info *)sih; | 759 | sii = container_of(sih, struct si_info, pub); |
760 | 760 | ||
761 | if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) | 761 | if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) |
762 | bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true); | 762 | bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true); |
@@ -767,7 +767,7 @@ void ai_pci_down(struct si_pub *sih) | |||
767 | { | 767 | { |
768 | struct si_info *sii; | 768 | struct si_info *sii; |
769 | 769 | ||
770 | sii = (struct si_info *)sih; | 770 | sii = container_of(sih, struct si_info, pub); |
771 | 771 | ||
772 | if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) | 772 | if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) |
773 | bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false); | 773 | bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false); |
@@ -790,7 +790,7 @@ bool ai_deviceremoved(struct si_pub *sih) | |||
790 | u32 w; | 790 | u32 w; |
791 | struct si_info *sii; | 791 | struct si_info *sii; |
792 | 792 | ||
793 | sii = (struct si_info *)sih; | 793 | sii = container_of(sih, struct si_info, pub); |
794 | 794 | ||
795 | if (sii->icbus->hosttype != BCMA_HOSTTYPE_PCI) | 795 | if (sii->icbus->hosttype != BCMA_HOSTTYPE_PCI) |
796 | return false; | 796 | return false; |