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 tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ptp
/
ptp_pch.c
diff --git
a/drivers/ptp/ptp_pch.c
b/drivers/ptp/ptp_pch.c
index e624e4dd2abb001444c08dc0593800ddab9f8da0..1367655eee39784ec53995a55270f6fb349f89a7 100644
(file)
--- a/
drivers/ptp/ptp_pch.c
+++ b/
drivers/ptp/ptp_pch.c
@@
-557,7
+557,7
@@
static s32 pch_resume(struct pci_dev *pdev)
#define pch_resume NULL
#endif
#define pch_resume NULL
#endif
-static void
__devexit
pch_remove(struct pci_dev *pdev)
+static void pch_remove(struct pci_dev *pdev)
{
struct pch_dev *chip = pci_get_drvdata(pdev);
{
struct pch_dev *chip = pci_get_drvdata(pdev);
@@
-581,7
+581,7
@@
static void __devexit pch_remove(struct pci_dev *pdev)
dev_info(&pdev->dev, "complete\n");
}
dev_info(&pdev->dev, "complete\n");
}
-static s32
__devinit
+static s32
pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
s32 ret;
pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
s32 ret;