dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

tty: remove use of __devexit 

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>
This commit is contained in:
Bill Pemberton 2012-11-19 13:26:18 -05:00 committed by Greg Kroah-Hartman
parent 512f82a064
commit ae8d8a1467
53 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/cyclades.c
View File

@ -3931,7 +3931,7 @@ err:
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;

2
drivers/tty/hvc/hvc_opal.c
View File

@ -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;

2
drivers/tty/hvc/hvc_vio.c
View File

@ -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;

4
drivers/tty/hvc/hvcs.c
View File

@ -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);
@ -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;

4
drivers/tty/isicom.c
View File

@ -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) },
@ -1635,7 +1635,7 @@ err:
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;

2
drivers/tty/moxa.c
View File

@ -1020,7 +1020,7 @@ err:
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);

2
drivers/tty/mxser.c
View File

@ -2658,7 +2658,7 @@ err:
#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);

4
drivers/tty/nozomi.c
View File

@ -1507,7 +1507,7 @@ err:
return ret;
}
static void __devexit tty_exit(struct nozomi *dc)
static void tty_exit(struct nozomi *dc)
{
unsigned int i;
@ -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;

2
drivers/tty/serial/8250/8250.c
View File

@ -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;

2
drivers/tty/serial/8250/8250_acorn.c
View File

@ -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;

2
drivers/tty/serial/8250/8250_dw.c
View File

@ -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);

2
drivers/tty/serial/8250/8250_em.c
View File

@ -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);

4
drivers/tty/serial/8250/8250_hp300.c
View File

@ -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 },
@ -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;

12
drivers/tty/serial/8250/8250_pci.c
View File

@ -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;
@ -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;
@ -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;
@ -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;
@ -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 */
@ -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);

2
drivers/tty/serial/8250/8250_pnp.c
View File

@ -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)

2
drivers/tty/serial/altera_jtaguart.c
View File

@ -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;

2
drivers/tty/serial/altera_uart.c
View File

@ -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);

2
drivers/tty/serial/ar933x_uart.c
View File

@ -707,7 +707,7 @@ err_free_up:
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;

2
drivers/tty/serial/arc_uart.c
View File

@ -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;

2
drivers/tty/serial/atmel_serial.c
View File

@ -1851,7 +1851,7 @@ err:
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);

2
drivers/tty/serial/bcm63xx_uart.c
View File

@ -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;

2
drivers/tty/serial/bfin_sport_uart.c
View File

@ -850,7 +850,7 @@ out_error_free_mem:
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);

2
drivers/tty/serial/bfin_uart.c
View File

@ -1389,7 +1389,7 @@ out_error_free_mem:
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);

2
drivers/tty/serial/clps711x.c
View File

@ -491,7 +491,7 @@ err_out:
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;

2
drivers/tty/serial/cpm_uart/cpm_uart_core.c
View File

@ -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);

2
drivers/tty/serial/efm32-uart.c
View File

@ -764,7 +764,7 @@ err_get_base:
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);

2
drivers/tty/serial/icom.c
View File

@ -1596,7 +1596,7 @@ probe_exit0:
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;

2
drivers/tty/serial/jsm/jsm_driver.c
View File

@ -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;

2
drivers/tty/serial/lpc32xx_hs.c
View File

@ -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);

2
drivers/tty/serial/max3100.c
View File

@ -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;

2
drivers/tty/serial/max310x.c
View File

@ -1202,7 +1202,7 @@ err_out:
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);

2
drivers/tty/serial/mcf.c
View File

@ -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;

2
drivers/tty/serial/mrst_max3110.c
View File

@ -855,7 +855,7 @@ err_get_page:
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);

2
drivers/tty/serial/msm_serial.c
View File

@ -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);

2
drivers/tty/serial/msm_serial_hs.c
View File

@ -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;

2
drivers/tty/serial/mux.c
View File

@ -520,7 +520,7 @@ static int __init mux_probe(struct parisc_device *dev)
return 0;
}
static int __devexit mux_remove(struct parisc_device *dev)
static int mux_remove(struct parisc_device *dev)
{
int i, j;
int port_count = (long)dev_get_drvdata(&dev->dev);

2
drivers/tty/serial/mxs-auart.c
View File

@ -1137,7 +1137,7 @@ out:
return ret;
}
static int __devexit mxs_auart_remove(struct platform_device *pdev)
static int mxs_auart_remove(struct platform_device *pdev)
{
struct mxs_auart_port *s = platform_get_drvdata(pdev);

2
drivers/tty/serial/omap-serial.c
View File

@ -1441,7 +1441,7 @@ err_port_line:
return ret;
}
static int __devexit serial_omap_remove(struct platform_device *dev)
static int serial_omap_remove(struct platform_device *dev)
{
struct uart_omap_port *up = platform_get_drvdata(dev);

2
drivers/tty/serial/samsung.c
View File

@ -1256,7 +1256,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
return ret;
}
static int __devexit s3c24xx_serial_remove(struct platform_device *dev)
static int s3c24xx_serial_remove(struct platform_device *dev)
{
struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);

2
drivers/tty/serial/sccnxp.c
View File

@ -943,7 +943,7 @@ err_out:
return ret;
}
static int __devexit sccnxp_remove(struct platform_device *pdev)
static int sccnxp_remove(struct platform_device *pdev)
{
int i;
struct sccnxp_port *s = platform_get_drvdata(pdev);

6
drivers/tty/serial/serial_txx9.c
View File

@ -1078,7 +1078,7 @@ static int serial_txx9_register_port(struct uart_port *port)
* Remove one serial port. This may not be called from interrupt
* context. We hand the port back to the our control.
*/
static void __devexit serial_txx9_unregister_port(int line)
static void serial_txx9_unregister_port(int line)
{
struct uart_txx9_port *uart = &serial_txx9_ports[line];
@ -1126,7 +1126,7 @@ static int serial_txx9_probe(struct platform_device *dev)
/*
* Remove serial ports registered against a platform device.
*/
static int __devexit serial_txx9_remove(struct platform_device *dev)
static int serial_txx9_remove(struct platform_device *dev)
{
int i;
@ -1217,7 +1217,7 @@ pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
return 0;
}
static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev)
static void pciserial_txx9_remove_one(struct pci_dev *dev)
{
struct uart_txx9_port *up = pci_get_drvdata(dev);

2
drivers/tty/serial/sunhv.c
View File

@ -598,7 +598,7 @@ out_free_port:
return err;
}
static int __devexit hv_remove(struct platform_device *dev)
static int hv_remove(struct platform_device *dev)
{
struct uart_port *port = dev_get_drvdata(&dev->dev);

2
drivers/tty/serial/sunsab.c
View File

@ -1063,7 +1063,7 @@ out:
return err;
}
static int __devexit sab_remove(struct platform_device *op)
static int sab_remove(struct platform_device *op)
{
struct uart_sunsab_port *up = dev_get_drvdata(&op->dev);

2
drivers/tty/serial/sunsu.c
View File

@ -1503,7 +1503,7 @@ out_unmap:
return err;
}
static int __devexit su_remove(struct platform_device *op)
static int su_remove(struct platform_device *op)
{
struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
bool kbdms = false;

4
drivers/tty/serial/sunzilog.c
View File

@ -1507,7 +1507,7 @@ static int zs_probe(struct platform_device *op)
return 0;
}
static void __devexit zs_remove_one(struct uart_sunzilog_port *up)
static void zs_remove_one(struct uart_sunzilog_port *up)
{
if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {
#ifdef CONFIG_SERIO
@ -1517,7 +1517,7 @@ static void __devexit zs_remove_one(struct uart_sunzilog_port *up)
uart_remove_one_port(&sunzilog_reg, &up->port);
}
static int __devexit zs_remove(struct platform_device *op)
static int zs_remove(struct platform_device *op)
{
struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev);
struct zilog_layout __iomem *regs;

2
drivers/tty/serial/timbuart.c
View File

@ -492,7 +492,7 @@ err_mem:
return err;
}
static int __devexit timbuart_remove(struct platform_device *dev)
static int timbuart_remove(struct platform_device *dev)
{
struct timbuart_port *uart = platform_get_drvdata(dev);

4
drivers/tty/serial/uartlite.c
View File

@ -542,7 +542,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq)
*
* @dev: pointer to device structure
*/
static int __devexit ulite_release(struct device *dev)
static int ulite_release(struct device *dev)
{
struct uart_port *port = dev_get_drvdata(dev);
int rc = 0;
@ -593,7 +593,7 @@ static int ulite_probe(struct platform_device *pdev)
return ulite_assign(&pdev->dev, id, res->start, res2->start);
}
static int __devexit ulite_remove(struct platform_device *pdev)
static int ulite_remove(struct platform_device *pdev)
{
return ulite_release(&pdev->dev);
}

2
drivers/tty/serial/vr41xx_siu.c
View File

@ -901,7 +901,7 @@ static int siu_probe(struct platform_device *dev)
return 0;
}
static int __devexit siu_remove(struct platform_device *dev)
static int siu_remove(struct platform_device *dev)
{
struct uart_port *port;
int i;

2
drivers/tty/serial/vt8500_serial.c
View File

@ -634,7 +634,7 @@ err:
return ret;
}
static int __devexit vt8500_serial_remove(struct platform_device *pdev)
static int vt8500_serial_remove(struct platform_device *pdev)
{
struct vt8500_port *vt8500_port = platform_get_drvdata(pdev);

2
drivers/tty/serial/xilinx_uartps.c
View File

@ -997,7 +997,7 @@ static int xuartps_probe(struct platform_device *pdev)
*
* Returns 0 on success, negative error otherwise
**/
static int __devexit xuartps_remove(struct platform_device *pdev)
static int xuartps_remove(struct platform_device *pdev)
{
struct uart_port *port = dev_get_drvdata(&pdev->dev);
int rc = 0;

2
drivers/tty/synclink.c
View File

@ -8117,7 +8117,7 @@ static int synclink_init_one (struct pci_dev *dev,
return 0;
}
static void __devexit synclink_remove_one (struct pci_dev *dev)
static void synclink_remove_one (struct pci_dev *dev)
{
}

2
drivers/tty/synclink_gt.c
View File

@ -3710,7 +3710,7 @@ static int init_one(struct pci_dev *dev,
return 0;
}
static void __devexit remove_one(struct pci_dev *dev)
static void remove_one(struct pci_dev *dev)
{
}

2
drivers/tty/synclinkmp.c
View File

@ -5606,6 +5606,6 @@ static int synclinkmp_init_one (struct pci_dev *dev,
return 0;
}
static void __devexit synclinkmp_remove_one (struct pci_dev *dev)
static void synclinkmp_remove_one (struct pci_dev *dev)
{
}