aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-20 13:31:00 -0400
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-03-20 13:31:00 -0400
commit8c6457504f9a8806409c4885a620faedf1348dca (patch)
tree05d67180a38ab35814405024a80ef2b93f5efc47
parent2988f8f946e6cd6713e9ee06181bed3a1f90a62a (diff)
video: fbdev: i810: remove incorrect __exit markups
Even if bus is not hot-pluggable, devices can be unbound from the driver via sysfs, so we should not be using __exit annotations on remove() methods. The only exception is drivers registered with platform_driver_probe() which specifically disables sysfs bind/unbind attributes. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r--drivers/video/fbdev/i810/i810_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/i810/i810_main.c b/drivers/video/fbdev/i810/i810_main.c
index 483ab2592d0c..2488baab7c89 100644
--- a/drivers/video/fbdev/i810/i810_main.c
+++ b/drivers/video/fbdev/i810/i810_main.c
@@ -81,7 +81,7 @@ static u32 voffset;
81static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor); 81static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor);
82static int i810fb_init_pci(struct pci_dev *dev, 82static int i810fb_init_pci(struct pci_dev *dev,
83 const struct pci_device_id *entry); 83 const struct pci_device_id *entry);
84static void __exit i810fb_remove_pci(struct pci_dev *dev); 84static void i810fb_remove_pci(struct pci_dev *dev);
85static int i810fb_resume(struct pci_dev *dev); 85static int i810fb_resume(struct pci_dev *dev);
86static int i810fb_suspend(struct pci_dev *dev, pm_message_t state); 86static int i810fb_suspend(struct pci_dev *dev, pm_message_t state);
87 87
@@ -128,7 +128,7 @@ static struct pci_driver i810fb_driver = {
128 .name = "i810fb", 128 .name = "i810fb",
129 .id_table = i810fb_pci_tbl, 129 .id_table = i810fb_pci_tbl,
130 .probe = i810fb_init_pci, 130 .probe = i810fb_init_pci,
131 .remove = __exit_p(i810fb_remove_pci), 131 .remove = i810fb_remove_pci,
132 .suspend = i810fb_suspend, 132 .suspend = i810fb_suspend,
133 .resume = i810fb_resume, 133 .resume = i810fb_resume,
134}; 134};
@@ -2123,7 +2123,7 @@ static void i810fb_release_resource(struct fb_info *info,
2123 2123
2124} 2124}
2125 2125
2126static void __exit i810fb_remove_pci(struct pci_dev *dev) 2126static void i810fb_remove_pci(struct pci_dev *dev)
2127{ 2127{
2128 struct fb_info *info = pci_get_drvdata(dev); 2128 struct fb_info *info = pci_get_drvdata(dev);
2129 struct i810fb_par *par = info->par; 2129 struct i810fb_par *par = info->par;