From 23eec9e1776d2e4ff7872f4d547d6913922c8977 Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Mon, 8 Aug 2011 15:58:33 +0200 Subject: [PATCH] staging: brcm80211: remove SDLX_MSG from brcmfmac Use unified debug macros in fullmac Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 7b6678791946..09531608c5c6 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -29,6 +29,7 @@ #include #include "dhd.h" #include "dhd_bus.h" +#include "dhd_dbg.h" #include "sdio_host.h" #define SDIOH_API_ACCESS_RETRY_LIMIT 2 @@ -55,9 +56,6 @@ #define BRCMF_SD_INFO(x) #endif /* BCMDBG */ -/* debugging macros */ -#define SDLX_MSG(x) - #define SDIOH_CMD_TYPE_NORMAL 0 /* Normal command */ #define SDIOH_CMD_TYPE_APPEND 1 /* Append command */ #define SDIOH_CMD_TYPE_CUTTHRU 2 /* Cut-through command */ @@ -486,7 +484,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) card = brcmf_sdcard_attach((void *)0, ®s); if (!card) { - SDLX_MSG(("%s: attach failed\n", __func__)); + BRCMF_ERROR(("%s: attach failed\n", __func__)); goto err; } sdiodev->card = card; @@ -498,7 +496,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) sdiodev->bus = drvinfo.attach((vendevid >> 16), (vendevid & 0xFFFF), 0, 0, 0, 0, regs, card); if (!sdiodev->bus) { - SDLX_MSG(("%s: device attach failed\n", __func__)); + BRCMF_ERROR(("%s: device attach failed\n", __func__)); goto err; } @@ -525,7 +523,6 @@ int brcmf_sdio_register(struct brcmf_sdioh_driver *driver) { drvinfo = *driver; - SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n")); return brcmf_sdio_function_init(); } -- 2.30.2