* [PATCH 1/2] net: ks8851: Use module_spi_driver
@ 2013-04-07 9:33 Lars-Peter Clausen
2013-04-07 9:33 ` [PATCH 2/2] net: ks8851: Use dev_pm_ops Lars-Peter Clausen
2013-04-08 20:56 ` [PATCH 1/2] net: ks8851: Use module_spi_driver David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Lars-Peter Clausen @ 2013-04-07 9:33 UTC (permalink / raw)
To: David S. Miller; +Cc: Ben Dooks, netdev, linux-kernel, Lars-Peter Clausen
By using module_spi_driver we can eliminate a few lines of boilerplate code.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/net/ethernet/micrel/ks8851.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 8fb4812..84ca876 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1538,19 +1538,7 @@ static struct spi_driver ks8851_driver = {
.suspend = ks8851_suspend,
.resume = ks8851_resume,
};
-
-static int __init ks8851_init(void)
-{
- return spi_register_driver(&ks8851_driver);
-}
-
-static void __exit ks8851_exit(void)
-{
- spi_unregister_driver(&ks8851_driver);
-}
-
-module_init(ks8851_init);
-module_exit(ks8851_exit);
+module_spi_driver(ks8851_driver);
MODULE_DESCRIPTION("KS8851 Network driver");
MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] net: ks8851: Use dev_pm_ops
2013-04-07 9:33 [PATCH 1/2] net: ks8851: Use module_spi_driver Lars-Peter Clausen
@ 2013-04-07 9:33 ` Lars-Peter Clausen
2013-04-08 20:56 ` David Miller
2013-04-08 20:56 ` [PATCH 1/2] net: ks8851: Use module_spi_driver David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Lars-Peter Clausen @ 2013-04-07 9:33 UTC (permalink / raw)
To: David S. Miller; +Cc: Ben Dooks, netdev, linux-kernel, Lars-Peter Clausen
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/net/ethernet/micrel/ks8851.c | 37 +++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 84ca876..2d786b4 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1364,35 +1364,39 @@ static int ks8851_read_selftest(struct ks8851_net *ks)
/* driver bus management functions */
-#ifdef CONFIG_PM
-static int ks8851_suspend(struct spi_device *spi, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+
+static int ks8851_suspend(struct device *dev)
{
- struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
- struct net_device *dev = ks->netdev;
+ struct ks8851_net *ks = dev_get_drvdata(dev);
+ struct net_device *netdev = ks->netdev;
- if (netif_running(dev)) {
- netif_device_detach(dev);
- ks8851_net_stop(dev);
+ if (netif_running(netdev)) {
+ netif_device_detach(netdev);
+ ks8851_net_stop(netdev);
}
return 0;
}
-static int ks8851_resume(struct spi_device *spi)
+static int ks8851_resume(struct device *dev)
{
- struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
- struct net_device *dev = ks->netdev;
+ struct ks8851_net *ks = dev_get_drvdata(dev);
+ struct net_device *netdev = ks->netdev;
- if (netif_running(dev)) {
- ks8851_net_open(dev);
- netif_device_attach(dev);
+ if (netif_running(netdev)) {
+ ks8851_net_open(netdev);
+ netif_device_attach(netdev);
}
return 0;
}
+
+static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
+#define KS8851_PM_OPS (&ks8851_pm_ops)
+
#else
-#define ks8851_suspend NULL
-#define ks8851_resume NULL
+#define KS8851_PM_OPS NULL
#endif
static int ks8851_probe(struct spi_device *spi)
@@ -1532,11 +1536,10 @@ static struct spi_driver ks8851_driver = {
.driver = {
.name = "ks8851",
.owner = THIS_MODULE,
+ .pm = KS8851_PM_OPS,
},
.probe = ks8851_probe,
.remove = ks8851_remove,
- .suspend = ks8851_suspend,
- .resume = ks8851_resume,
};
module_spi_driver(ks8851_driver);
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] net: ks8851: Use module_spi_driver
2013-04-07 9:33 [PATCH 1/2] net: ks8851: Use module_spi_driver Lars-Peter Clausen
2013-04-07 9:33 ` [PATCH 2/2] net: ks8851: Use dev_pm_ops Lars-Peter Clausen
@ 2013-04-08 20:56 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-04-08 20:56 UTC (permalink / raw)
To: lars; +Cc: ben-linux, netdev, linux-kernel
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 7 Apr 2013 11:33:03 +0200
> By using module_spi_driver we can eliminate a few lines of boilerplate code.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] net: ks8851: Use dev_pm_ops
2013-04-07 9:33 ` [PATCH 2/2] net: ks8851: Use dev_pm_ops Lars-Peter Clausen
@ 2013-04-08 20:56 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-04-08 20:56 UTC (permalink / raw)
To: lars; +Cc: ben-linux, netdev, linux-kernel
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 7 Apr 2013 11:33:04 +0200
> Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-08 20:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-07 9:33 [PATCH 1/2] net: ks8851: Use module_spi_driver Lars-Peter Clausen
2013-04-07 9:33 ` [PATCH 2/2] net: ks8851: Use dev_pm_ops Lars-Peter Clausen
2013-04-08 20:56 ` David Miller
2013-04-08 20:56 ` [PATCH 1/2] net: ks8851: Use module_spi_driver David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).