Commit 41e48c3d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

enc28j60: Switch to use module_spi_driver() macro

Eliminate some boilerplate code by using module_spi_driver() instead of
->init() / ->exit(), moving the salient bits from ->init() into ->probe().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 571fb070
...@@ -417,11 +417,9 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) ...@@ -417,11 +417,9 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
} }
static unsigned long msec20_to_jiffies;
static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val) 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 */ /* 20 msec timeout read */
while ((nolock_regb_read(priv, reg) & mask) != val) { while ((nolock_regb_read(priv, reg) & mask) != val) {
...@@ -1632,22 +1630,7 @@ static struct spi_driver enc28j60_driver = { ...@@ -1632,22 +1630,7 @@ static struct spi_driver enc28j60_driver = {
.probe = enc28j60_probe, .probe = enc28j60_probe,
.remove = enc28j60_remove, .remove = enc28j60_remove,
}; };
module_spi_driver(enc28j60_driver);
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_DESCRIPTION(DRV_NAME " ethernet driver"); MODULE_DESCRIPTION(DRV_NAME " ethernet driver");
MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>"); MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>");
......
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