diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-05-03 11:35:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:42:42 -0700 |
| commit | b21c892d78aee4c6f2a8c2dfacca27074ac4d798 (patch) | |
| tree | 946fbf4105f8336b1ec7789bd91e5215dd8ba543 /drivers/staging/brcm80211/util/bcmsrom.c | |
| parent | 803d226ea238b71f0e3293fcd4a5607f40a542c5 (diff) | |
| download | op-kernel-dev-b21c892d78aee4c6f2a8c2dfacca27074ac4d798.zip op-kernel-dev-b21c892d78aee4c6f2a8c2dfacca27074ac4d798.tar.gz | |
staging: brcm80211: cleanup code in source file aiutils.c
The aiutils functions that were taken from siutils have been renamed
with proper ai_ prefix. Calling functions have been updated accordingly.
Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: 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/bcmsrom.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index 6026b32..8df4455 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -25,7 +25,7 @@ #include <sbchipc.h> #include <bcmdevs.h> #include <pcicfg.h> -#include <siutils.h> +#include <aiutils.h> #include <bcmsrom.h> #include <bcmsrom_tbl.h> @@ -353,7 +353,7 @@ static int initvars_flash(si_t *sih, char **base, uint len) if (err) goto exit; - si_devpath(sih, devpath, sizeof(devpath)); + ai_devpath(sih, devpath, sizeof(devpath)); /* grab vars with the <devpath> prefix in name */ dl = strlen(devpath); @@ -595,7 +595,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) return -2; sromwindow = (u16 *) SROM_OFFSET(sih); - if (si_is_sprom_available(sih)) { + if (ai_is_sprom_available(sih)) { err = sprom_read_pci(sih, sromwindow, 0, srom, SROM_WORDS, true); @@ -643,14 +643,14 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) u32 val; val = 0; - value = si_getdevpathvar(sih, "sromrev"); + value = ai_getdevpathvar(sih, "sromrev"); if (value) { sromrev = (u8) simple_strtoul(value, NULL, 0); flash = true; goto varscont; } - value = si_getnvramflvar(sih, "sromrev"); + value = ai_getnvramflvar(sih, "sromrev"); if (value) { err = 0; goto errout; |
