Skip to contentSkip to conversation

net: irda: nsc-ircc: switch driver to dev_pm_ops

PATCH New Arnaud Faucher 1 participant 1 message Jul 25, 2009 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: irda: nsc-ircc: switch driver to dev_pm_ops

Gets rid of the following warning:
Platform driver 'nsc-ircc' needs updating - please use dev_pm_ops

---
 drivers/net/irda/nsc-ircc.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/irda/nsc-ircc.c +11 -7
index 45fd9c1..c56946a 100644
@@ -74,14 +74,18 @@ static char *driver_name = "nsc-ircc";
 
 /* Power Management */
 #define NSC_IRCC_DRIVER_NAME                  "nsc-ircc"
-static int nsc_ircc_suspend(struct platform_device *dev, pm_message_t state);
-static int nsc_ircc_resume(struct platform_device *dev);
+static int nsc_ircc_suspend(struct device *dev);
+static int nsc_ircc_resume(struct device *dev);
 
-static struct platform_driver nsc_ircc_driver = {
+static struct dev_pm_ops nsc_ircc_pm_ops = {
 	.suspend	= nsc_ircc_suspend,
 	.resume		= nsc_ircc_resume,
+};
+
+static struct platform_driver nsc_ircc_driver = {
 	.driver		= {
 		.name	= NSC_IRCC_DRIVER_NAME,
+		.pm	= &nsc_ircc_pm_ops,
 	},
 };
 
@@ -2316,9 +2320,9 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	return ret;
 }
 
-static int nsc_ircc_suspend(struct platform_device *dev, pm_message_t state)
+static int nsc_ircc_suspend(struct device *dev)
 {
-     	struct nsc_ircc_cb *self = platform_get_drvdata(dev);
+	struct nsc_ircc_cb *self = dev_get_drvdata(dev);
  	int bank;
 	unsigned long flags;
  	int iobase = self->io.fir_base;
@@ -2352,9 +2356,9 @@ static int nsc_ircc_suspend(struct platform_device *dev, pm_message_t state)
 	return 0;
 }
 
-static int nsc_ircc_resume(struct platform_device *dev)
+static int nsc_ircc_resume(struct device *dev)
 {
- 	struct nsc_ircc_cb *self = platform_get_drvdata(dev);
+	struct nsc_ircc_cb *self = dev_get_drvdata(dev);
  	unsigned long flags;
 
 	if (!self->io.suspended)
Signature · 1 line
1.6.3.3