tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

orinoco: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Bill Pemberton and committed by
John W. Linville baa366cd 8dee5eef

+8 -8
+2 -2
drivers/net/wireless/orinoco/orinoco_nortel.c
··· 255 255 return err; 256 256 } 257 257 258 - static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev) 258 + static void orinoco_nortel_remove_one(struct pci_dev *pdev) 259 259 { 260 260 struct orinoco_private *priv = pci_get_drvdata(pdev); 261 261 struct orinoco_pci_card *card = priv->card; ··· 288 288 .name = DRIVER_NAME, 289 289 .id_table = orinoco_nortel_id_table, 290 290 .probe = orinoco_nortel_init_one, 291 - .remove = __devexit_p(orinoco_nortel_remove_one), 291 + .remove = orinoco_nortel_remove_one, 292 292 .suspend = orinoco_pci_suspend, 293 293 .resume = orinoco_pci_resume, 294 294 };
+2 -2
drivers/net/wireless/orinoco/orinoco_pci.c
··· 199 199 return err; 200 200 } 201 201 202 - static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) 202 + static void orinoco_pci_remove_one(struct pci_dev *pdev) 203 203 { 204 204 struct orinoco_private *priv = pci_get_drvdata(pdev); 205 205 ··· 228 228 .name = DRIVER_NAME, 229 229 .id_table = orinoco_pci_id_table, 230 230 .probe = orinoco_pci_init_one, 231 - .remove = __devexit_p(orinoco_pci_remove_one), 231 + .remove = orinoco_pci_remove_one, 232 232 .suspend = orinoco_pci_suspend, 233 233 .resume = orinoco_pci_resume, 234 234 };
+2 -2
drivers/net/wireless/orinoco/orinoco_plx.c
··· 294 294 return err; 295 295 } 296 296 297 - static void __devexit orinoco_plx_remove_one(struct pci_dev *pdev) 297 + static void orinoco_plx_remove_one(struct pci_dev *pdev) 298 298 { 299 299 struct orinoco_private *priv = pci_get_drvdata(pdev); 300 300 struct orinoco_pci_card *card = priv->card; ··· 334 334 .name = DRIVER_NAME, 335 335 .id_table = orinoco_plx_id_table, 336 336 .probe = orinoco_plx_init_one, 337 - .remove = __devexit_p(orinoco_plx_remove_one), 337 + .remove = orinoco_plx_remove_one, 338 338 .suspend = orinoco_pci_suspend, 339 339 .resume = orinoco_pci_resume, 340 340 };
+2 -2
drivers/net/wireless/orinoco/orinoco_tmd.c
··· 188 188 return err; 189 189 } 190 190 191 - static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev) 191 + static void orinoco_tmd_remove_one(struct pci_dev *pdev) 192 192 { 193 193 struct orinoco_private *priv = pci_get_drvdata(pdev); 194 194 struct orinoco_pci_card *card = priv->card; ··· 214 214 .name = DRIVER_NAME, 215 215 .id_table = orinoco_tmd_id_table, 216 216 .probe = orinoco_tmd_init_one, 217 - .remove = __devexit_p(orinoco_tmd_remove_one), 217 + .remove = orinoco_tmd_remove_one, 218 218 .suspend = orinoco_pci_suspend, 219 219 .resume = orinoco_pci_resume, 220 220 };