From patchwork Wed Mar 30 00:56:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 672882 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2U0vsrO029355 for ; Wed, 30 Mar 2011 00:57:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755385Ab1C3A5w (ORCPT ); Tue, 29 Mar 2011 20:57:52 -0400 Received: from mail.atheros.com ([12.19.149.2]:47200 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755125Ab1C3A5v (ORCPT ); Tue, 29 Mar 2011 20:57:51 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Tue, 29 Mar 2011 17:57:26 -0700 Received: from tux (10.10.10.239) by SC1EXHC-01.global.atheros.com (10.10.20.111) with Microsoft SMTP Server (TLS) id 8.2.213.0; Tue, 29 Mar 2011 17:57:50 -0700 Received: by tux (sSMTP sendmail emulation); Tue, 29 Mar 2011 17:57:48 -0700 From: "Luis R. Rodriguez" To: CC: , , , , "Luis R. Rodriguez" Subject: [PATCH 31/34] ath6kl: rename the pm ops to something more sensible Date: Tue, 29 Mar 2011 17:56:28 -0700 Message-ID: <1301446591-15236-32-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.7.4.15.g7811d In-Reply-To: <1301446591-15236-1-git-send-email-lrodriguez@atheros.com> References: <1301446591-15236-1-git-send-email-lrodriguez@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 30 Mar 2011 00:57:54 +0000 (UTC) diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index 359261b..314c552 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c @@ -164,14 +164,14 @@ static void ath6kl_hifdev_remove(struct sdio_func *func) } #if defined(CONFIG_PM) -static int hifDeviceSuspend(struct device *dev) +static int ath6kl_hifdev_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); int status = 0; struct hif_device *device; device = ath6kl_get_hifdev(func); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDeviceSuspend\n")); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_suspend\n")); if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) { @@ -184,7 +184,7 @@ static int hifDeviceSuspend(struct device *dev) } CleanupHIFScatterResources(device); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceSuspend\n")); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_suspend\n")); switch (status) { case 0: @@ -197,14 +197,14 @@ static int hifDeviceSuspend(struct device *dev) } } -static int hifDeviceResume(struct device *dev) +static int ath6kl_hifdev_resume(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); int status = 0; struct hif_device *device; device = ath6kl_get_hifdev(func); - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +hifDeviceResume\n")); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_resume\n")); if (device && device->claimedContext && osdrvCallbacks.deviceSuspendHandler) { status = osdrvCallbacks. @@ -212,14 +212,14 @@ static int hifDeviceResume(struct device *dev) if (status == 0) device->is_suspend = false; } - AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceResume\n")); + AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_resume\n")); return status; } -static const struct dev_pm_ops ar6k_device_pm_ops = { - .suspend = hifDeviceSuspend, - .resume = hifDeviceResume, +static const struct dev_pm_ops ath6kl_hifdev_pmops = { + .suspend = ath6kl_hifdev_suspend, + .resume = ath6kl_hifdev_resume, }; #endif /* CONFIG_PM */ @@ -230,7 +230,7 @@ static struct sdio_driver ath6kl_hifdev_driver = { .remove = ath6kl_hifdev_remove, #if defined(CONFIG_PM) .drv = { - .pm = &ar6k_device_pm_ops, + .pm = &ath6kl_hifdev_pmops, }, #endif };