From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 05/13] enc28j60: Switch to use module_spi_driver() macro
Date: Mon, 18 Mar 2019 18:10:54 +0200 [thread overview]
Message-ID: <20190318161102.27711-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20190318161102.27711-1-andriy.shevchenko@linux.intel.com>
Eliminate some boilerplate code by using module_spi_driver() instead of
->init() / ->exit(), moving the salient bits from ->init() into ->probe().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/net/ethernet/microchip/enc28j60.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 2e323f330ecb..4cf4525260b7 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -417,11 +417,9 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
mutex_unlock(&priv->lock);
}
-static unsigned long msec20_to_jiffies;
-
static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val)
{
- unsigned long timeout = jiffies + msec20_to_jiffies;
+ unsigned long timeout = jiffies + msecs_to_jiffies(20);
/* 20 msec timeout read */
while ((nolock_regb_read(priv, reg) & mask) != val) {
@@ -1632,22 +1630,7 @@ static struct spi_driver enc28j60_driver = {
.probe = enc28j60_probe,
.remove = enc28j60_remove,
};
-
-static int __init enc28j60_init(void)
-{
- msec20_to_jiffies = msecs_to_jiffies(20);
-
- return spi_register_driver(&enc28j60_driver);
-}
-
-module_init(enc28j60_init);
-
-static void __exit enc28j60_exit(void)
-{
- spi_unregister_driver(&enc28j60_driver);
-}
-
-module_exit(enc28j60_exit);
+module_spi_driver(enc28j60_driver);
MODULE_DESCRIPTION(DRV_NAME " ethernet driver");
MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>");
--
2.20.1
next prev parent reply other threads:[~2019-03-18 16:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 16:10 [PATCH v2 01/13] enc28j60: Use device_get_mac_address() Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 02/13] enc28j60: Remove duplicate messaging Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 03/13] enc28j60: Replace dev_*(&netdev->dev, ...) with netdev_*() Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 04/13] enc28j60: Drop driver name duplication from messages Andy Shevchenko
2019-03-18 16:10 ` Andy Shevchenko [this message]
2019-03-18 16:10 ` [PATCH v2 06/13] enc28j60: Use ether_addr_copy() in enc28j60_set_mac_address() Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 07/13] enc28j60: Switch to dev_<level> from pr_<level> Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 08/13] enc28j60: Convert HW related printk() to dev_printk() Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 09/13] enc28j60: Convert printk() to netdev_printk() Andy Shevchenko
2019-03-18 16:10 ` [PATCH v2 10/13] enc28j60: Remove linux/init.h Andy Shevchenko
2019-03-18 16:11 ` [PATCH v2 11/13] enc28j60: Amend comments by fixing typos, adding periods, etc Andy Shevchenko
2019-03-18 16:11 ` [PATCH v2 12/13] enc28j60: Fix indentation splats Andy Shevchenko
2019-03-18 16:11 ` [PATCH v2 13/13] enc28j60: Convert to use SPDX identifier Andy Shevchenko
2019-03-19 5:23 ` [PATCH v2 01/13] enc28j60: Use device_get_mac_address() David Miller
2019-03-19 10:17 ` Andy Shevchenko
2019-03-19 17:55 ` David Miller
2019-03-19 18:49 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2019-03-19 18:49 [PATCH v2 00/13] enc28j60: messaging clean up and ACPI improvements Andy Shevchenko
2019-03-19 18:49 ` [PATCH v2 05/13] enc28j60: Switch to use module_spi_driver() macro Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190318161102.27711-5-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).