diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-03-15 15:40:15 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-29 13:38:20 -0700 |
| commit | 30184b9b5a1744f4f118dfdd8030f758b5a690ab (patch) | |
| tree | 928ab19b94bd98b95912612f43feeed8e7ca53cb /drivers | |
| parent | ba121123068656e007955d090915c8c94a436fd4 (diff) | |
net:wireless:bcmdhd: rename bcmsdh_remove & bcmsdh_probe
rename bcmsdh_remove & bcmsdh_probe to *_bcmdhd
to resolve symbol conflicts with bcm4329 driver.
Bug 956238
Change-Id: I750238ddf9b3a0d9ff9583a7ec456aceef28531c
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/90656
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Gerrit_Virtual_Submit
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_linux.c | 20 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c | 17 |
2 files changed, 18 insertions, 19 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c index 414b172a9ab1..d467e4b5630e 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c @@ -135,24 +135,24 @@ bcmsdh_chipmatch(uint16 vendor, uint16 device) #if defined(BCMPLATFORM_BUS) #if defined(BCMLXSDMMC) /* forward declarations */ -int bcmsdh_probe(struct device *dev); -int bcmsdh_remove(struct device *dev); +int bcmsdh_probe_bcmdhd(struct device *dev); +int bcmsdh_remove_bcmdhd(struct device *dev); -EXPORT_SYMBOL(bcmsdh_probe); -EXPORT_SYMBOL(bcmsdh_remove); +EXPORT_SYMBOL(bcmsdh_probe_bcmdhd); +EXPORT_SYMBOL(bcmsdh_remove_bcmdhd); #else /* forward declarations */ -static int __devinit bcmsdh_probe(struct device *dev); -static int __devexit bcmsdh_remove(struct device *dev); +static int __devinit bcmsdh_probe_bcmdhd(struct device *dev); +static int __devexit bcmsdh_remove_bcmdhd(struct device *dev); #endif /* BCMLXSDMMC */ #ifndef BCMLXSDMMC static struct device_driver bcmsdh_driver = { .name = "pxa2xx-mci", .bus = &platform_bus_type, - .probe = bcmsdh_probe, - .remove = bcmsdh_remove, + .probe = bcmsdh_probe_bcmdhd, + .remove = bcmsdh_remove_bcmdhd, .suspend = NULL, .resume = NULL, }; @@ -161,7 +161,7 @@ static struct device_driver bcmsdh_driver = { #ifndef BCMLXSDMMC static #endif /* BCMLXSDMMC */ -int bcmsdh_probe(struct device *dev) +int bcmsdh_probe_bcmdhd(struct device *dev) { osl_t *osh = NULL; bcmsdh_hc_t *sdhc = NULL; @@ -269,7 +269,7 @@ err: #ifndef BCMLXSDMMC static #endif /* BCMLXSDMMC */ -int bcmsdh_remove(struct device *dev) +int bcmsdh_remove_bcmdhd(struct device *dev) { bcmsdh_hc_t *sdhc, *prev; osl_t *osh; diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c index 6ec4a7532e4a..ef48d1f45e47 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c @@ -87,8 +87,8 @@ PBCMSDH_SDMMC_INSTANCE gInstance; /* Maximum number of bcmsdh_sdmmc devices supported by driver */ #define BCMSDH_SDMMC_MAX_DEVICES 1 -extern int bcmsdh_probe(struct device *dev); -extern int bcmsdh_remove(struct device *dev); +extern int bcmsdh_probe_bcmdhd(struct device *dev); +extern int bcmsdh_remove_bcmdhd(struct device *dev); extern volatile bool dhd_mmc_suspend; @@ -109,8 +109,8 @@ static int bcmsdh_sdmmc_probe(struct sdio_func *func, gInstance->func[0] = &sdio_func_0; if(func->device == 0x4) { /* 4318 */ gInstance->func[2] = NULL; - sd_trace(("NIC found, calling bcmsdh_probe...\n")); - ret = bcmsdh_probe(&func->dev); + sd_trace(("NIC found, calling bcmsdh_probe_bcmdhd...\n")); + ret = bcmsdh_probe_bcmdhd(&func->dev); } } @@ -120,8 +120,8 @@ static int bcmsdh_sdmmc_probe(struct sdio_func *func, #ifdef WL_CFG80211 wl_cfg80211_set_sdio_func(func); #endif - sd_trace(("F2 found, calling bcmsdh_probe...\n")); - ret = bcmsdh_probe(&func->dev); + sd_trace(("F2 found, calling bcmsdh_probe_bcmdhd...\n")); + ret = bcmsdh_probe_bcmdhd(&func->dev); } return ret; @@ -136,8 +136,8 @@ static void bcmsdh_sdmmc_remove(struct sdio_func *func) sd_info(("Function#: 0x%04x\n", func->num)); if (func->num == 2) { - sd_trace(("F2 found, calling bcmsdh_remove...\n")); - bcmsdh_remove(&func->dev); + sd_trace(("F2 found, calling bcmsdh_remove_bcmdhd...\n")); + bcmsdh_remove_bcmdhd(&func->dev); } else if (func->num == 1) { sdio_claim_host(func); sdio_disable_func(func); @@ -339,7 +339,6 @@ int sdio_function_init(void) /* * module cleanup */ -extern int bcmsdh_remove(struct device *dev); void sdio_function_cleanup(void) { sd_trace(("%s Enter\n", __FUNCTION__)); |