Commit 437c567b authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman

ath6kl: rename the pm ops to something more sensible

This has no functional changes.

Cc: Naveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0174d3c2
...@@ -164,14 +164,14 @@ static void ath6kl_hifdev_remove(struct sdio_func *func) ...@@ -164,14 +164,14 @@ static void ath6kl_hifdev_remove(struct sdio_func *func)
} }
#if defined(CONFIG_PM) #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); struct sdio_func *func = dev_to_sdio_func(dev);
int status = 0; int status = 0;
struct hif_device *device; struct hif_device *device;
device = ath6kl_get_hifdev(func); 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 && if (device && device->claimedContext &&
osdrvCallbacks.deviceSuspendHandler) { osdrvCallbacks.deviceSuspendHandler) {
...@@ -184,7 +184,7 @@ static int hifDeviceSuspend(struct device *dev) ...@@ -184,7 +184,7 @@ static int hifDeviceSuspend(struct device *dev)
} }
CleanupHIFScatterResources(device); CleanupHIFScatterResources(device);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceSuspend\n")); AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_suspend\n"));
switch (status) { switch (status) {
case 0: case 0:
...@@ -197,14 +197,14 @@ static int hifDeviceSuspend(struct device *dev) ...@@ -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); struct sdio_func *func = dev_to_sdio_func(dev);
int status = 0; int status = 0;
struct hif_device *device; struct hif_device *device;
device = ath6kl_get_hifdev(func); 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 && if (device && device->claimedContext &&
osdrvCallbacks.deviceSuspendHandler) { osdrvCallbacks.deviceSuspendHandler) {
status = osdrvCallbacks. status = osdrvCallbacks.
...@@ -212,14 +212,14 @@ static int hifDeviceResume(struct device *dev) ...@@ -212,14 +212,14 @@ static int hifDeviceResume(struct device *dev)
if (status == 0) if (status == 0)
device->is_suspend = false; 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; return status;
} }
static const struct dev_pm_ops ar6k_device_pm_ops = { static const struct dev_pm_ops ath6kl_hifdev_pmops = {
.suspend = hifDeviceSuspend, .suspend = ath6kl_hifdev_suspend,
.resume = hifDeviceResume, .resume = ath6kl_hifdev_resume,
}; };
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
...@@ -230,7 +230,7 @@ static struct sdio_driver ath6kl_hifdev_driver = { ...@@ -230,7 +230,7 @@ static struct sdio_driver ath6kl_hifdev_driver = {
.remove = ath6kl_hifdev_remove, .remove = ath6kl_hifdev_remove,
#if defined(CONFIG_PM) #if defined(CONFIG_PM)
.drv = { .drv = {
.pm = &ar6k_device_pm_ops, .pm = &ath6kl_hifdev_pmops,
}, },
#endif #endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment