projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
jme.c
diff --git
a/drivers/net/ethernet/jme.c
b/drivers/net/ethernet/jme.c
index 60ac46f4ac085380630c5f35af7892e65cc980f5..0519afa413d22714b88e355f1cea862f11650cba 100644
(file)
--- a/
drivers/net/ethernet/jme.c
+++ b/
drivers/net/ethernet/jme.c
@@
-2965,7
+2965,7
@@
static const struct net_device_ops jme_netdev_ops = {
#endif
};
#endif
};
-static int
__devinit
+static int
jme_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
jme_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
@@
-3203,7
+3203,7
@@
err_out:
return rc;
}
return rc;
}
-static void
__devexit
+static void
jme_remove_one(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
jme_remove_one(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
@@
-3318,7
+3318,7
@@
static struct pci_driver jme_driver = {
.name = DRV_NAME,
.id_table = jme_pci_tbl,
.probe = jme_init_one,
.name = DRV_NAME,
.id_table = jme_pci_tbl,
.probe = jme_init_one,
- .remove =
__devexit_p(jme_remove_one)
,
+ .remove =
jme_remove_one
,
.shutdown = jme_shutdown,
.driver.pm = JME_PM_OPS,
};
.shutdown = jme_shutdown,
.driver.pm = JME_PM_OPS,
};