diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-03-02 20:18:43 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-03 00:48:04 (GMT) |
| commit | 4fe9042fe05a828293f693405f14b3f6a7898866 (patch) | |
| tree | f903441c37492744eee425573284e5501304fdf3 /drivers/staging/brcm80211/util/linux_osl.c | |
| parent | 8da4a3a03430b9be293f6a427197261de330956a (diff) | |
| download | linux-4fe9042fe05a828293f693405f14b3f6a7898866.tar.xz | |
staging: brcm80211: remove unused attributes from struct osl_info
Getting rid of the whole osl concept soon this removes most fields
in struct osl_info. Turned out hnddma.c was still using it so this
was fixed and now it gets pointer to bus device from si_info which
it only needs in the attach function for this purpose so reference
to it does not need to be kept. Two unused functions referencing
the removed fields in linux_osl.c also were removed.
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>
Diffstat (limited to 'drivers/staging/brcm80211/util/linux_osl.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 99e4496..70c35e9 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -43,29 +43,7 @@ struct osl_info *osl_attach(void *pdev, uint bustype) ASSERT(osh); memset(osh, 0, sizeof(struct osl_info)); - osh->magic = OS_HANDLE_MAGIC; - osh->pdev = pdev; - osh->bustype = bustype; - - switch (bustype) { - case PCI_BUS: - case SI_BUS: - case PCMCIA_BUS: - osh->mmbus = true; - break; - case JTAG_BUS: - case SDIO_BUS: - case USB_BUS: - case SPI_BUS: - case RPC_BUS: - osh->mmbus = false; - break; - default: - ASSERT(false); - break; - } - return osh; } @@ -78,22 +56,6 @@ void osl_detach(struct osl_info *osh) kfree(osh); } -/* return bus # for the pci device pointed by osh->pdev */ -uint osl_pci_bus(struct osl_info *osh) -{ - ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev); - - return ((struct pci_dev *)osh->pdev)->bus->number; -} - -/* return slot # for the pci device pointed by osh->pdev */ -uint osl_pci_slot(struct osl_info *osh) -{ - ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev); - - return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn); -} - #if defined(BCMDBG_ASSERT) void osl_assert(char *exp, char *file, int line) { |