Skip to content

Commit

Permalink
tty: remove use of __devexit_p
Browse files Browse the repository at this point in the history
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 2520e27 commit 91116cb
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/tty/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -3973,7 +3973,7 @@ static struct pci_driver cy_pci_driver = {
.name = "cyclades",
.id_table = cy_pci_dev_id,
.probe = cy_pci_probe,
.remove = __devexit_p(cy_pci_remove)
.remove = cy_pci_remove
};
#endif

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/hvc/hvc_opal.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static int __devexit hvc_opal_remove(struct platform_device *dev)

static struct platform_driver hvc_opal_driver = {
.probe = hvc_opal_probe,
.remove = __devexit_p(hvc_opal_remove),
.remove = hvc_opal_remove,
.driver = {
.name = hvc_opal_name,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/hvc/hvcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
static struct vio_driver hvcs_vio_driver = {
.id_table = hvcs_driver_table,
.probe = hvcs_probe,
.remove = __devexit_p(hvcs_remove),
.remove = hvcs_remove,
.name = hvcs_driver_name,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/isicom.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static struct pci_driver isicom_driver = {
.name = "isicom",
.id_table = isicom_pci_tbl,
.probe = isicom_probe,
.remove = __devexit_p(isicom_remove)
.remove = isicom_remove
};

static int prev_card = 3; /* start servicing isi_card[0] */
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/moxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ static struct pci_driver moxa_pci_driver = {
.name = "moxa",
.id_table = moxa_pcibrds,
.probe = moxa_pci_probe,
.remove = __devexit_p(moxa_pci_remove)
.remove = moxa_pci_remove
};
#endif /* CONFIG_PCI */

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/mxser.c
Original file line number Diff line number Diff line change
Expand Up @@ -2677,7 +2677,7 @@ static struct pci_driver mxser_driver = {
.name = "mxser",
.id_table = mxser_pcibrds,
.probe = mxser_probe,
.remove = __devexit_p(mxser_remove)
.remove = mxser_remove
};

static int __init mxser_module_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/nozomi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ static struct pci_driver nozomi_driver = {
.name = NOZOMI_NAME,
.id_table = nozomi_pci_tbl,
.probe = nozomi_card_init,
.remove = __devexit_p(nozomi_card_exit),
.remove = nozomi_card_exit,
};

static __init int nozomi_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/synclink.c
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ static struct pci_driver synclink_pci_driver = {
.name = "synclink",
.id_table = synclink_pci_tbl,
.probe = synclink_init_one,
.remove = __devexit_p(synclink_remove_one),
.remove = synclink_remove_one,
};

static struct tty_driver *serial_driver;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/synclink_gt.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static struct pci_driver pci_driver = {
.name = "synclink_gt",
.id_table = pci_table,
.probe = init_one,
.remove = __devexit_p(remove_one),
.remove = remove_one,
};

static bool pci_registered;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/synclinkmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ static struct pci_driver synclinkmp_pci_driver = {
.name = "synclinkmp",
.id_table = synclinkmp_pci_tbl,
.probe = synclinkmp_init_one,
.remove = __devexit_p(synclinkmp_remove_one),
.remove = synclinkmp_remove_one,
};


Expand Down

0 comments on commit 91116cb

Please sign in to comment.