diff --git a/[refs] b/[refs] index 7f4cf27d5c02..5480c3748ba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 437c567b1a02bdd50a9d0ce57c1310b827eb0ae4 +refs/heads/master: 628a7dd85cff27db40a1759d883a76a6fef20346 diff --git a/trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index 314c5525dbc2..c8f1a6ec37ad 100644 --- a/trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c @@ -144,7 +144,6 @@ static void ath6kl_hifdev_remove(struct sdio_func *func) { int status = 0; struct hif_device *device; - AR_DEBUG_ASSERT(func != NULL); device = ath6kl_get_hifdev(func); if (device->claimedContext != NULL) @@ -159,8 +158,6 @@ static void ath6kl_hifdev_remove(struct sdio_func *func) CleanupHIFScatterResources(device); delHifDevice(device); - AR_DEBUG_ASSERT(status == 0); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceRemoved\n")); } #if defined(CONFIG_PM) @@ -171,7 +168,6 @@ static int ath6kl_hifdev_suspend(struct device *dev) struct hif_device *device; device = ath6kl_get_hifdev(func); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_suspend\n")); if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) { @@ -184,7 +180,6 @@ static int ath6kl_hifdev_suspend(struct device *dev) } CleanupHIFScatterResources(device); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_suspend\n")); switch (status) { case 0: @@ -204,7 +199,6 @@ static int ath6kl_hifdev_resume(struct device *dev) struct hif_device *device; device = ath6kl_get_hifdev(func); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_resume\n")); if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) { status = osdrvCallbacks. @@ -212,7 +206,6 @@ static int ath6kl_hifdev_resume(struct device *dev) if (status == 0) device->is_suspend = false; } - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_resume\n")); return status; }