Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 338447
b: refs/heads/master
c: 2d47b71
h: refs/heads/master
i:
  338445: e53a3d3
  338443: 5ac021c
  338439: 6db754d
  338431: 14bfec1
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 77e1142 commit 3e7b483
Show file tree
Hide file tree
Showing 45 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91116cba5da0c33f3093b804e487bea02b830bfb
refs/heads/master: 2d47b7160243b1422006b91debf438484a4fde58
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3078,7 +3078,7 @@ static int serial8250_resume(struct platform_device *dev)

static struct platform_driver serial8250_isa_driver = {
.probe = serial8250_probe,
.remove = __devexit_p(serial8250_remove),
.remove = serial8250_remove,
.suspend = serial8250_suspend,
.resume = serial8250_resume,
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250_acorn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static const struct ecard_id serial_cids[] = {

static struct ecard_driver serial_card_driver = {
.probe = serial_card_probe,
.remove = __devexit_p(serial_card_remove),
.remove = serial_card_remove,
.id_table = serial_cids,
.drv = {
.name = "8250_acorn",
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250_dw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static struct platform_driver dw8250_platform_driver = {
.of_match_table = dw8250_match,
},
.probe = dw8250_probe,
.remove = __devexit_p(dw8250_remove),
.remove = dw8250_remove,
.suspend = dw8250_suspend,
.resume = dw8250_resume,
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250_em.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static struct platform_driver serial8250_em_platform_driver = {
.owner = THIS_MODULE,
},
.probe = serial8250_em_probe,
.remove = __devexit_p(serial8250_em_remove),
.remove = serial8250_em_remove,
};

module_platform_driver(serial8250_em_platform_driver);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250_hp300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static struct dio_driver hpdca_driver = {
.name = "hpdca",
.id_table = hpdca_dio_tbl,
.probe = hpdca_init_one,
.remove = __devexit_p(hpdca_remove_one),
.remove = hpdca_remove_one,
};

#endif
Expand Down
50 changes: 25 additions & 25 deletions trunk/drivers/tty/serial/8250/8250_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ite887x_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ite887x_exit),
.exit = pci_ite887x_exit,
},
/*
* National Instruments
Expand All @@ -1326,7 +1326,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1335,7 +1335,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1344,7 +1344,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1353,7 +1353,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1362,7 +1362,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1371,7 +1371,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1380,7 +1380,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1389,7 +1389,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1398,7 +1398,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1407,7 +1407,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1416,7 +1416,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1425,7 +1425,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8420_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_ni8420_exit),
.exit = pci_ni8420_exit,
},
{
.vendor = PCI_VENDOR_ID_NI,
Expand All @@ -1434,7 +1434,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_ni8430_init,
.setup = pci_ni8430_setup,
.exit = __devexit_p(pci_ni8430_exit),
.exit = pci_ni8430_exit,
},
/*
* Panacom
Expand All @@ -1446,7 +1446,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
{
.vendor = PCI_VENDOR_ID_PANACOM,
Expand All @@ -1455,7 +1455,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_ANY_ID,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
/*
* PLX
Expand All @@ -1474,7 +1474,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_EXSYS_4055,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
{
.vendor = PCI_VENDOR_ID_PLX,
Expand All @@ -1483,7 +1483,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_KEYSPAN_SX2,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
{
.vendor = PCI_VENDOR_ID_PLX,
Expand All @@ -1492,7 +1492,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_UNKNOWN_0x1584,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
{
.vendor = PCI_VENDOR_ID_PLX,
Expand All @@ -1501,7 +1501,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_DEVICE_ID_PLX_ROMULUS,
.init = pci_plx9050_init,
.setup = pci_default_setup,
.exit = __devexit_p(pci_plx9050_exit),
.exit = pci_plx9050_exit,
},
/*
* SBS Technologies, Inc., PMC-OCTALPRO 232
Expand All @@ -1513,7 +1513,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_OCTPRO232,
.init = sbs_init,
.setup = sbs_setup,
.exit = __devexit_p(sbs_exit),
.exit = sbs_exit,
},
/*
* SBS Technologies, Inc., PMC-OCTALPRO 422
Expand All @@ -1525,7 +1525,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_OCTPRO422,
.init = sbs_init,
.setup = sbs_setup,
.exit = __devexit_p(sbs_exit),
.exit = sbs_exit,
},
/*
* SBS Technologies, Inc., P-Octal 232
Expand All @@ -1537,7 +1537,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_POCTAL232,
.init = sbs_init,
.setup = sbs_setup,
.exit = __devexit_p(sbs_exit),
.exit = sbs_exit,
},
/*
* SBS Technologies, Inc., P-Octal 422
Expand All @@ -1549,7 +1549,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.subdevice = PCI_SUBDEVICE_ID_POCTAL422,
.init = sbs_init,
.setup = sbs_setup,
.exit = __devexit_p(sbs_exit),
.exit = sbs_exit,
},
/*
* SIIG cards - these may be called via parport_serial
Expand Down Expand Up @@ -4323,7 +4323,7 @@ static const struct pci_error_handlers serial8250_err_handler = {
static struct pci_driver serial_pci_driver = {
.name = "serial",
.probe = pciserial_init_one,
.remove = __devexit_p(pciserial_remove_one),
.remove = pciserial_remove_one,
#ifdef CONFIG_PM
.suspend = pciserial_suspend_one,
.resume = pciserial_resume_one,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/8250_pnp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ static int serial_pnp_resume(struct pnp_dev *dev)
static struct pnp_driver serial_pnp_driver = {
.name = "serial",
.probe = serial_pnp_probe,
.remove = __devexit_p(serial_pnp_remove),
.remove = serial_pnp_remove,
.suspend = serial_pnp_suspend,
.resume = serial_pnp_resume,
.id_table = pnp_dev_table,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/altera_jtaguart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ MODULE_DEVICE_TABLE(of, altera_jtaguart_match);

static struct platform_driver altera_jtaguart_platform_driver = {
.probe = altera_jtaguart_probe,
.remove = __devexit_p(altera_jtaguart_remove),
.remove = altera_jtaguart_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/altera_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ MODULE_DEVICE_TABLE(of, altera_uart_match);

static struct platform_driver altera_uart_platform_driver = {
.probe = altera_uart_probe,
.remove = __devexit_p(altera_uart_remove),
.remove = altera_uart_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/ar933x_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ static int __devexit ar933x_uart_remove(struct platform_device *pdev)

static struct platform_driver ar933x_uart_platform_driver = {
.probe = ar933x_uart_probe,
.remove = __devexit_p(ar933x_uart_remove),
.remove = ar933x_uart_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/arc_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ static int __devexit arc_serial_remove(struct platform_device *pdev)

static struct platform_driver arc_platform_driver = {
.probe = arc_serial_probe,
.remove = __devexit_p(arc_serial_remove),
.remove = arc_serial_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/atmel_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)

static struct platform_driver atmel_serial_driver = {
.probe = atmel_serial_probe,
.remove = __devexit_p(atmel_serial_remove),
.remove = atmel_serial_remove,
.suspend = atmel_serial_suspend,
.resume = atmel_serial_resume,
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/bcm63xx_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ static int __devexit bcm_uart_remove(struct platform_device *pdev)
*/
static struct platform_driver bcm_uart_platform_driver = {
.probe = bcm_uart_probe,
.remove = __devexit_p(bcm_uart_remove),
.remove = bcm_uart_remove,
.driver = {
.owner = THIS_MODULE,
.name = "bcm63xx_uart",
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/bfin_sport_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ static int __devexit sport_uart_remove(struct platform_device *pdev)

static struct platform_driver sport_uart_driver = {
.probe = sport_uart_probe,
.remove = __devexit_p(sport_uart_remove),
.remove = sport_uart_remove,
.driver = {
.name = DRV_NAME,
#ifdef CONFIG_PM
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/bfin_uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@ static int __devexit bfin_serial_remove(struct platform_device *pdev)

static struct platform_driver bfin_serial_driver = {
.probe = bfin_serial_probe,
.remove = __devexit_p(bfin_serial_remove),
.remove = bfin_serial_remove,
.suspend = bfin_serial_suspend,
.resume = bfin_serial_resume,
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/clps711x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ static struct platform_driver clps711x_uart_driver = {
.owner = THIS_MODULE,
},
.probe = uart_clps711x_probe,
.remove = __devexit_p(uart_clps711x_remove),
.remove = uart_clps711x_remove,
};
module_platform_driver(clps711x_uart_driver);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/efm32-uart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ MODULE_DEVICE_TABLE(of, efm32_uart_dt_ids);

static struct platform_driver efm32_uart_driver = {
.probe = efm32_uart_probe,
.remove = __devexit_p(efm32_uart_remove),
.remove = efm32_uart_remove,

.driver = {
.name = DRIVER_NAME,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/icom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,7 @@ static struct pci_driver icom_pci_driver = {
.name = ICOM_DRIVER_NAME,
.id_table = icom_pci_table,
.probe = icom_probe,
.remove = __devexit_p(icom_remove),
.remove = icom_remove,
};

static int __init icom_init(void)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/ifx6x60.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ static struct spi_driver ifx_spi_driver = {
.owner = THIS_MODULE},
.probe = ifx_spi_spi_probe,
.shutdown = ifx_spi_spi_shutdown,
.remove = __devexit_p(ifx_spi_spi_remove),
.remove = ifx_spi_spi_remove,
.suspend = ifx_spi_spi_suspend,
.resume = ifx_spi_spi_resume,
.id_table = ifx_id_table
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/jsm/jsm_driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ static struct pci_driver jsm_driver = {
.name = "jsm",
.id_table = jsm_pci_tbl,
.probe = jsm_probe_one,
.remove = __devexit_p(jsm_remove_one),
.remove = jsm_remove_one,
.err_handler = &jsm_err_handler,
};

Expand Down
Loading

0 comments on commit 3e7b483

Please sign in to comment.