Skip to content

Commit

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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Cc: Lucas Tavares <lucaskt@linux.vnet.ibm.com>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Tony Prisk <linux@prisktech.co.nz>
Acked-by: David Brown <davidb@codeaurora.org>
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 512f82a commit ae8d8a1
Show file tree
Hide file tree
Showing 53 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion drivers/tty/cyclades.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3931,7 +3931,7 @@ static int cy_pci_probe(struct pci_dev *pdev,
return retval;
}

static void __devexit cy_pci_remove(struct pci_dev *pdev)
static void cy_pci_remove(struct pci_dev *pdev)
{
struct cyclades_card *cinfo = pci_get_drvdata(pdev);
unsigned int i, channel;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/hvc/hvc_opal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int hvc_opal_probe(struct platform_device *dev)
return 0;
}

static int __devexit hvc_opal_remove(struct platform_device *dev)
static int hvc_opal_remove(struct platform_device *dev)
{
struct hvc_struct *hp = dev_get_drvdata(&dev->dev);
int rc, termno;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/hvc/hvc_vio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ static int hvc_vio_probe(struct vio_dev *vdev,
return 0;
}

static int __devexit hvc_vio_remove(struct vio_dev *vdev)
static int hvc_vio_remove(struct vio_dev *vdev)
{
struct hvc_struct *hp = dev_get_drvdata(&vdev->dev);
int rc, termno;
Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/hvc/hvcs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static void hvcs_hangup(struct tty_struct * tty);

static int hvcs_probe(struct vio_dev *dev,
const struct vio_device_id *id);
static int __devexit hvcs_remove(struct vio_dev *dev);
static int hvcs_remove(struct vio_dev *dev);
static int __init hvcs_module_init(void);
static void __exit hvcs_module_exit(void);
static int hvcs_initialize(void);
Expand Down Expand Up @@ -835,7 +835,7 @@ static int hvcs_probe(
return 0;
}

static int __devexit hvcs_remove(struct vio_dev *dev)
static int hvcs_remove(struct vio_dev *dev)
{
struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev);
unsigned long flags;
Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/isicom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
#endif

static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
static void __devexit isicom_remove(struct pci_dev *);
static void isicom_remove(struct pci_dev *);

static struct pci_device_id isicom_pci_tbl[] = {
{ PCI_DEVICE(VENDOR_ID, 0x2028) },
Expand Down Expand Up @@ -1635,7 +1635,7 @@ static int isicom_probe(struct pci_dev *pdev,
return retval;
}

static void __devexit isicom_remove(struct pci_dev *pdev)
static void isicom_remove(struct pci_dev *pdev)
{
struct isi_board *board = pci_get_drvdata(pdev);
unsigned int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/moxa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
return retval;
}

static void __devexit moxa_pci_remove(struct pci_dev *pdev)
static void moxa_pci_remove(struct pci_dev *pdev)
{
struct moxa_board_conf *brd = pci_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/mxser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2658,7 +2658,7 @@ static int mxser_probe(struct pci_dev *pdev,
#endif
}

static void __devexit mxser_remove(struct pci_dev *pdev)
static void mxser_remove(struct pci_dev *pdev)
{
#ifdef CONFIG_PCI
struct mxser_board *brd = pci_get_drvdata(pdev);
Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/nozomi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ static int nozomi_card_init(struct pci_dev *pdev,
return ret;
}

static void __devexit tty_exit(struct nozomi *dc)
static void tty_exit(struct nozomi *dc)
{
unsigned int i;

Expand All @@ -1530,7 +1530,7 @@ static void __devexit tty_exit(struct nozomi *dc)
}

/* Deallocate memory for one device */
static void __devexit nozomi_card_exit(struct pci_dev *pdev)
static void nozomi_card_exit(struct pci_dev *pdev)
{
int i;
struct ctrl_ul ctrl;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3035,7 +3035,7 @@ static int serial8250_probe(struct platform_device *dev)
/*
* Remove serial ports registered against a platform device.
*/
static int __devexit serial8250_remove(struct platform_device *dev)
static int serial8250_remove(struct platform_device *dev)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250_acorn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
return 0;
}

static void __devexit serial_card_remove(struct expansion_card *ec)
static void serial_card_remove(struct expansion_card *ec)
{
struct serial_card_info *info = ecard_get_drvdata(ec);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250_dw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static int dw8250_probe(struct platform_device *pdev)
return 0;
}

static int __devexit dw8250_remove(struct platform_device *pdev)
static int dw8250_remove(struct platform_device *pdev)
{
struct dw8250_data *data = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250_em.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static int serial8250_em_probe(struct platform_device *pdev)
return ret;
}

static int __devexit serial8250_em_remove(struct platform_device *pdev)
static int serial8250_em_remove(struct platform_device *pdev)
{
struct serial8250_em_priv *priv = platform_get_drvdata(pdev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/serial/8250/8250_hp300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static struct hp300_port *hp300_ports;

static int hpdca_init_one(struct dio_dev *d,
const struct dio_device_id *ent);
static void __devexit hpdca_remove_one(struct dio_dev *d);
static void hpdca_remove_one(struct dio_dev *d);

static struct dio_device_id hpdca_dio_tbl[] = {
{ DIO_ID_DCA0 },
Expand Down Expand Up @@ -288,7 +288,7 @@ static int __init hp300_8250_init(void)
}

#ifdef CONFIG_HPDCA
static void __devexit hpdca_remove_one(struct dio_dev *d)
static void hpdca_remove_one(struct dio_dev *d)
{
int line;

Expand Down
12 changes: 6 additions & 6 deletions drivers/tty/serial/8250/8250_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int pci_plx9050_init(struct pci_dev *dev)
return 0;
}

static void __devexit pci_plx9050_exit(struct pci_dev *dev)
static void pci_plx9050_exit(struct pci_dev *dev)
{
u8 __iomem *p;

Expand All @@ -313,7 +313,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev)
#define NI8420_INT_ENABLE_REG 0x38
#define NI8420_INT_ENABLE_BIT 0x2000

static void __devexit pci_ni8420_exit(struct pci_dev *dev)
static void pci_ni8420_exit(struct pci_dev *dev)
{
void __iomem *p;
unsigned long base, len;
Expand Down Expand Up @@ -345,7 +345,7 @@ static void __devexit pci_ni8420_exit(struct pci_dev *dev)

#define MITE_LCIMR2_CLR_CPU_IE (1 << 30)

static void __devexit pci_ni8430_exit(struct pci_dev *dev)
static void pci_ni8430_exit(struct pci_dev *dev)
{
void __iomem *p;
unsigned long base, len;
Expand Down Expand Up @@ -422,7 +422,7 @@ static int sbs_init(struct pci_dev *dev)
* Disables the global interrupt of PMC-OctalPro
*/

static void __devexit sbs_exit(struct pci_dev *dev)
static void sbs_exit(struct pci_dev *dev)
{
u8 __iomem *p;

Expand Down Expand Up @@ -991,7 +991,7 @@ static int pci_ite887x_init(struct pci_dev *dev)
return ret;
}

static void __devexit pci_ite887x_exit(struct pci_dev *dev)
static void pci_ite887x_exit(struct pci_dev *dev)
{
u32 ioport;
/* the ioport is bit 0-15 in POSIO0R */
Expand Down Expand Up @@ -2988,7 +2988,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
return rc;
}

static void __devexit pciserial_remove_one(struct pci_dev *dev)
static void pciserial_remove_one(struct pci_dev *dev)
{
struct serial_private *priv = pci_get_drvdata(dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250_pnp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
return 0;
}

static void __devexit serial_pnp_remove(struct pnp_dev *dev)
static void serial_pnp_remove(struct pnp_dev *dev)
{
long line = (long)pnp_get_drvdata(dev);
if (line)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/altera_jtaguart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ static int altera_jtaguart_probe(struct platform_device *pdev)
return 0;
}

static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
static int altera_jtaguart_remove(struct platform_device *pdev)
{
struct uart_port *port;
int i = pdev->id;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/altera_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ static int altera_uart_probe(struct platform_device *pdev)
return 0;
}

static int __devexit altera_uart_remove(struct platform_device *pdev)
static int altera_uart_remove(struct platform_device *pdev)
{
struct uart_port *port = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/ar933x_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ static int ar933x_uart_probe(struct platform_device *pdev)
return ret;
}

static int __devexit ar933x_uart_remove(struct platform_device *pdev)
static int ar933x_uart_remove(struct platform_device *pdev)
{
struct ar933x_uart_port *up;

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/arc_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ static int arc_serial_probe(struct platform_device *pdev)
return uart_add_one_port(&arc_uart_driver, &uart->port);
}

static int __devexit arc_serial_remove(struct platform_device *pdev)
static int arc_serial_remove(struct platform_device *pdev)
{
/* This will never be called */
return 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/atmel_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
return ret;
}

static int __devexit atmel_serial_remove(struct platform_device *pdev)
static int atmel_serial_remove(struct platform_device *pdev)
{
struct uart_port *port = platform_get_drvdata(pdev);
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/bcm63xx_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ static int bcm_uart_probe(struct platform_device *pdev)
return 0;
}

static int __devexit bcm_uart_remove(struct platform_device *pdev)
static int bcm_uart_remove(struct platform_device *pdev)
{
struct uart_port *port;

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/bfin_sport_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ static int sport_uart_probe(struct platform_device *pdev)
return ret;
}

static int __devexit sport_uart_remove(struct platform_device *pdev)
static int sport_uart_remove(struct platform_device *pdev)
{
struct sport_uart_port *sport = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/bfin_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ static int bfin_serial_probe(struct platform_device *pdev)
return ret;
}

static int __devexit bfin_serial_remove(struct platform_device *pdev)
static int bfin_serial_remove(struct platform_device *pdev)
{
struct bfin_serial_port *uart = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/clps711x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ static int uart_clps711x_probe(struct platform_device *pdev)
return ret;
}

static int __devexit uart_clps711x_remove(struct platform_device *pdev)
static int uart_clps711x_remove(struct platform_device *pdev)
{
struct clps711x_port *s = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/cpm_uart/cpm_uart_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ static int cpm_uart_probe(struct platform_device *ofdev)
return uart_add_one_port(&cpm_reg, &pinfo->port);
}

static int __devexit cpm_uart_remove(struct platform_device *ofdev)
static int cpm_uart_remove(struct platform_device *ofdev)
{
struct uart_cpm_port *pinfo = dev_get_drvdata(&ofdev->dev);
return uart_remove_one_port(&cpm_reg, &pinfo->port);
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/efm32-uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ static int efm32_uart_probe(struct platform_device *pdev)
return ret;
}

static int __devexit efm32_uart_remove(struct platform_device *pdev)
static int efm32_uart_remove(struct platform_device *pdev)
{
struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/icom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ static int icom_probe(struct pci_dev *dev,
return retval;
}

static void __devexit icom_remove(struct pci_dev *dev)
static void icom_remove(struct pci_dev *dev)
{
struct icom_adapter *icom_adapter;
struct list_head *tmp;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/jsm/jsm_driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return rc;
}

static void __devexit jsm_remove_one(struct pci_dev *pdev)
static void jsm_remove_one(struct pci_dev *pdev)
{
struct jsm_board *brd = pci_get_drvdata(pdev);
int i = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/lpc32xx_hs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ static int serial_hs_lpc32xx_probe(struct platform_device *pdev)
/*
* Remove serial ports registered against a platform device.
*/
static int __devexit serial_hs_lpc32xx_remove(struct platform_device *pdev)
static int serial_hs_lpc32xx_remove(struct platform_device *pdev)
{
struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/max3100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ static int max3100_probe(struct spi_device *spi)
return 0;
}

static int __devexit max3100_remove(struct spi_device *spi)
static int max3100_remove(struct spi_device *spi)
{
struct max3100_port *s = dev_get_drvdata(&spi->dev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/max310x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ static int max310x_probe(struct spi_device *spi)
return ret;
}

static int __devexit max310x_remove(struct spi_device *spi)
static int max310x_remove(struct spi_device *spi)
{
struct device *dev = &spi->dev;
struct max310x_port *s = dev_get_drvdata(dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/mcf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ static int mcf_probe(struct platform_device *pdev)

/****************************************************************************/

static int __devexit mcf_remove(struct platform_device *pdev)
static int mcf_remove(struct platform_device *pdev)
{
struct uart_port *port;
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/mrst_max3110.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ static int serial_m3110_probe(struct spi_device *spi)
return ret;
}

static int __devexit serial_m3110_remove(struct spi_device *dev)
static int serial_m3110_remove(struct spi_device *dev)
{
struct uart_max3110 *max = spi_get_drvdata(dev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/msm_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
return uart_add_one_port(&msm_uart_driver, port);
}

static int __devexit msm_serial_remove(struct platform_device *pdev)
static int msm_serial_remove(struct platform_device *pdev)
{
struct msm_port *msm_port = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/msm_serial_hs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static int msm_hs_request_port(struct uart_port *port)
return 0;
}

static int __devexit msm_hs_remove(struct platform_device *pdev)
static int msm_hs_remove(struct platform_device *pdev)
{

struct msm_hs_port *msm_uport;
Expand Down
Loading

0 comments on commit ae8d8a1

Please sign in to comment.