diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:17:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:02 -0500 |
commit | 4c62e9764ab403d42f9b8871b1241fe7812f19d4 (patch) | |
tree | b4ae1ce3993ebf1d64660ba16362f9ef3de73074 /drivers/media/pci/pt1/pt1.c | |
parent | c571b211a70bcb04249be5cb7338f95d2ec8100f (diff) |
Drivers: media: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/pci/pt1/pt1.c')
-rw-r--r-- | drivers/media/pci/pt1/pt1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c index 15b35c4725f1..e9211086df49 100644 --- a/drivers/media/pci/pt1/pt1.c +++ b/drivers/media/pci/pt1/pt1.c | |||
@@ -1058,7 +1058,7 @@ static void pt1_i2c_init(struct pt1 *pt1) | |||
1058 | pt1_i2c_emit(pt1, i, 0, 0, 1, 1, 0); | 1058 | pt1_i2c_emit(pt1, i, 0, 0, 1, 1, 0); |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | static void __devexit pt1_remove(struct pci_dev *pdev) | 1061 | static void pt1_remove(struct pci_dev *pdev) |
1062 | { | 1062 | { |
1063 | struct pt1 *pt1; | 1063 | struct pt1 *pt1; |
1064 | void __iomem *regs; | 1064 | void __iomem *regs; |
@@ -1083,8 +1083,7 @@ static void __devexit pt1_remove(struct pci_dev *pdev) | |||
1083 | pci_disable_device(pdev); | 1083 | pci_disable_device(pdev); |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | static int __devinit | 1086 | static int pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
1087 | pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | ||
1088 | { | 1087 | { |
1089 | int ret; | 1088 | int ret; |
1090 | void __iomem *regs; | 1089 | void __iomem *regs; |
@@ -1222,7 +1221,7 @@ MODULE_DEVICE_TABLE(pci, pt1_id_table); | |||
1222 | static struct pci_driver pt1_driver = { | 1221 | static struct pci_driver pt1_driver = { |
1223 | .name = DRIVER_NAME, | 1222 | .name = DRIVER_NAME, |
1224 | .probe = pt1_probe, | 1223 | .probe = pt1_probe, |
1225 | .remove = __devexit_p(pt1_remove), | 1224 | .remove = pt1_remove, |
1226 | .id_table = pt1_id_table, | 1225 | .id_table = pt1_id_table, |
1227 | }; | 1226 | }; |
1228 | 1227 | ||