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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
isdn
/
hardware
/
mISDN
/
hfcpci.c
diff --git
a/drivers/isdn/hardware/mISDN/hfcpci.c
b/drivers/isdn/hardware/mISDN/hfcpci.c
index 6e99d73563b8abbe8b5c6931b741ab15a5536a33..a7e4939787c957a0f7975c4ea3d8aaaa390e6d2b 100644
(file)
--- a/
drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/
drivers/isdn/hardware/mISDN/hfcpci.c
@@
-2215,7
+2215,7
@@
static struct pci_device_id hfc_ids[] =
{},
};
{},
};
-static int
__devinit
+static int
hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
int err = -ENOMEM;
hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
int err = -ENOMEM;
@@
-2246,7
+2246,7
@@
hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err;
}
return err;
}
-static void
__devexit
+static void
hfc_remove_pci(struct pci_dev *pdev)
{
struct hfc_pci *card = pci_get_drvdata(pdev);
hfc_remove_pci(struct pci_dev *pdev)
{
struct hfc_pci *card = pci_get_drvdata(pdev);
@@
-2263,7
+2263,7
@@
hfc_remove_pci(struct pci_dev *pdev)
static struct pci_driver hfc_driver = {
.name = "hfcpci",
.probe = hfc_probe,
static struct pci_driver hfc_driver = {
.name = "hfcpci",
.probe = hfc_probe,
- .remove =
__devexit_p(hfc_remove_pci)
,
+ .remove =
hfc_remove_pci
,
.id_table = hfc_ids,
};
.id_table = hfc_ids,
};