Skip to content

Commit

Permalink
ath6kl: rename the pm ops to something more sensible
Browse files Browse the repository at this point in the history
This has no functional changes.

Cc: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent 0174d3c commit 437c567
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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:
Expand All @@ -197,29 +197,29 @@ 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.
deviceResumeHandler(device->claimedContext);
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 */

Expand All @@ -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
};
Expand Down

0 comments on commit 437c567

Please sign in to comment.