Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 336891
b: refs/heads/master
c: 4b12b89
h: refs/heads/master
i:
  336889: 2b63292
  336887: 8928b1f
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent fb5b3c5 commit 609f77b
Show file tree
Hide file tree
Showing 53 changed files with 57 additions and 57 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: 1d1313686422db3bffb2e7bd8eb2ccd9027d3783
refs/heads/master: 4b12b896c27c3b54592816606679f5b02f638930
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/acquirewdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static int acq_probe(struct platform_device *dev)
return ret;
}

static int __devexit acq_remove(struct platform_device *dev)
static int acq_remove(struct platform_device *dev)
{
misc_deregister(&acq_miscdev);
release_region(wdt_start, 1);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/advantechwdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static int advwdt_probe(struct platform_device *dev)
goto out;
}

static int __devexit advwdt_remove(struct platform_device *dev)
static int advwdt_remove(struct platform_device *dev)
{
misc_deregister(&advwdt_miscdev);
release_region(wdt_start, 1);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ar7_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ static int ar7_wdt_probe(struct platform_device *pdev)
return rc;
}

static int __devexit ar7_wdt_remove(struct platform_device *pdev)
static int ar7_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ar7_wdt_miscdev);
clk_put(vbus_clk);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/at91rm9200_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static int at91wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit at91wdt_remove(struct platform_device *pdev)
static int at91wdt_remove(struct platform_device *pdev)
{
int res;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ath79_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static int ath79_wdt_probe(struct platform_device *pdev)
return err;
}

static int __devexit ath79_wdt_remove(struct platform_device *pdev)
static int ath79_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ath79_wdt_miscdev);
clk_disable(wdt_clk);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/bcm63xx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit bcm63xx_wdt_remove(struct platform_device *pdev)
static int bcm63xx_wdt_remove(struct platform_device *pdev)
{
if (!nowayout)
bcm63xx_wdt_pause();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/bfin_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ static int bfin_wdt_probe(struct platform_device *pdev)
* Unregisters the misc device. Actual device
* deinitialization is handled by bfin_wdt_close().
*/
static int __devexit bfin_wdt_remove(struct platform_device *pdev)
static int bfin_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&bfin_wdt_miscdev);
return 0;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/watchdog/cpu5wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ static int cpu5wdt_init_module(void)
return cpu5wdt_init();
}

static void __devexit cpu5wdt_exit(void)
static void cpu5wdt_exit(void)
{
if (cpu5wdt_device.queue) {
cpu5wdt_device.queue = 0;
Expand All @@ -274,7 +274,7 @@ static void __devexit cpu5wdt_exit(void)

}

static void __devexit cpu5wdt_exit_module(void)
static void cpu5wdt_exit_module(void)
{
cpu5wdt_exit();
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/cpwd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ static int cpwd_probe(struct platform_device *op)
goto out;
}

static int __devexit cpwd_remove(struct platform_device *op)
static int cpwd_remove(struct platform_device *op)
{
struct cpwd *p = dev_get_drvdata(&op->dev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/da9052_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ static int da9052_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit da9052_wdt_remove(struct platform_device *pdev)
static int da9052_wdt_remove(struct platform_device *pdev)
{
struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/davinci_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit davinci_wdt_remove(struct platform_device *pdev)
static int davinci_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&davinci_wdt_miscdev);
if (wdt_mem) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/dw_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
return ret;
}

static int __devexit dw_wdt_drv_remove(struct platform_device *pdev)
static int dw_wdt_drv_remove(struct platform_device *pdev)
{
misc_deregister(&dw_wdt_miscdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ep93xx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static int ep93xx_wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)
static int ep93xx_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&ep93xx_wdt_wdd);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/gef_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static int gef_wdt_probe(struct platform_device *dev)
return misc_register(&gef_wdt_miscdev);
}

static int __devexit gef_wdt_remove(struct platform_device *dev)
static int gef_wdt_remove(struct platform_device *dev)
{
misc_deregister(&gef_wdt_miscdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/geodewdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ static int geodewdt_probe(struct platform_device *dev)
return ret;
}

static int __devexit geodewdt_remove(struct platform_device *dev)
static int geodewdt_remove(struct platform_device *dev)
{
misc_deregister(&geodewdt_miscdev);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/hpwdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ static int hpwdt_init_one(struct pci_dev *dev,
return retval;
}

static void __devexit hpwdt_exit(struct pci_dev *dev)
static void hpwdt_exit(struct pci_dev *dev)
{
if (!nowayout)
hpwdt_stop();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/i6300esb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ static int esb_probe(struct pci_dev *pdev,
return ret;
}

static void __devexit esb_remove(struct pci_dev *pdev)
static void esb_remove(struct pci_dev *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/watchdog/iTCO_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ static struct watchdog_device iTCO_wdt_watchdog_dev = {
* Init & exit routines
*/

static void __devexit iTCO_wdt_cleanup(void)
static void iTCO_wdt_cleanup(void)
{
/* Stop the timer before we leave */
if (!nowayout)
Expand Down Expand Up @@ -533,7 +533,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
return ret;
}

static int __devexit iTCO_wdt_remove(struct platform_device *dev)
static int iTCO_wdt_remove(struct platform_device *dev)
{
if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res)
iTCO_wdt_cleanup();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ib700wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int ibwdt_probe(struct platform_device *dev)
return res;
}

static int __devexit ibwdt_remove(struct platform_device *dev)
static int ibwdt_remove(struct platform_device *dev)
{
misc_deregister(&ibwdt_miscdev);
release_region(WDT_START, 1);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ie6xx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ static int ie6xx_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit ie6xx_wdt_remove(struct platform_device *pdev)
static int ie6xx_wdt_remove(struct platform_device *pdev)
{
struct resource *res;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/jz4740_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit jz4740_wdt_remove(struct platform_device *pdev)
static int jz4740_wdt_remove(struct platform_device *pdev)
{
struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/ks8695_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ static int ks8695wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit ks8695wdt_remove(struct platform_device *pdev)
static int ks8695wdt_remove(struct platform_device *pdev)
{
int res;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/lantiq_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ ltq_wdt_probe(struct platform_device *pdev)
return misc_register(&ltq_wdt_miscdev);
}

static int __devexit
static int
ltq_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ltq_wdt_miscdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/max63xx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static int max63xx_wdt_probe(struct platform_device *pdev)
return watchdog_register_device(&max63xx_wdt_dev);
}

static int __devexit max63xx_wdt_remove(struct platform_device *pdev)
static int max63xx_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&max63xx_wdt_dev);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/mpc8xxx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
return ret;
}

static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev)
static int mpc8xxx_wdt_remove(struct platform_device *ofdev)
{
mpc8xxx_wdt_pr_warn("watchdog removed");
del_timer_sync(&wdt_timer);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/mpcore_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ static int mpcore_wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit mpcore_wdt_remove(struct platform_device *pdev)
static int mpcore_wdt_remove(struct platform_device *pdev)
{
platform_set_drvdata(pdev, NULL);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/mtx-1_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
static int mtx1_wdt_remove(struct platform_device *pdev)
{
/* FIXME: do we need to lock this test ? */
if (mtx1_wdt_device.queue) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/mv64x60_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
return misc_register(&mv64x60_wdt_miscdev);
}

static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
static int mv64x60_wdt_remove(struct platform_device *dev)
{
misc_deregister(&mv64x60_wdt_miscdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/nuc900_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static int nuc900wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit nuc900wdt_remove(struct platform_device *pdev)
static int nuc900wdt_remove(struct platform_device *pdev)
{
misc_deregister(&nuc900wdt_miscdev);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/watchdog/nv_tco.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ static int nv_tco_init(struct platform_device *dev)
return ret;
}

static void __devexit nv_tco_cleanup(void)
static void nv_tco_cleanup(void)
{
u32 val;

Expand All @@ -445,7 +445,7 @@ static void __devexit nv_tco_cleanup(void)
release_region(tcobase, 0x10);
}

static int __devexit nv_tco_remove(struct platform_device *dev)
static int nv_tco_remove(struct platform_device *dev)
{
if (tcobase)
nv_tco_cleanup();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/of_xilinx_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static int xwdt_probe(struct platform_device *pdev)
return rc;
}

static int __devexit xwdt_remove(struct platform_device *dev)
static int xwdt_remove(struct platform_device *dev)
{
misc_deregister(&xwdt_miscdev);
iounmap(xdev.base);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/omap_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ static void omap_wdt_shutdown(struct platform_device *pdev)
}
}

static int __devexit omap_wdt_remove(struct platform_device *pdev)
static int omap_wdt_remove(struct platform_device *pdev)
{
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/orion_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit orion_wdt_remove(struct platform_device *pdev)
static int orion_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&orion_wdt);
clk_disable_unprepare(clk);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/pcwd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ static int pcwd_isa_probe(struct device *dev, unsigned int id)
return ret;
}

static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id)
static int pcwd_isa_remove(struct device *dev, unsigned int id)
{
if (debug >= DEBUG)
pr_debug("pcwd_isa_remove id=%d\n", id);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/pcwd_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ static int pcipcwd_card_init(struct pci_dev *pdev,
return ret;
}

static void __devexit pcipcwd_card_exit(struct pci_dev *pdev)
static void pcipcwd_card_exit(struct pci_dev *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/pnx4008_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&pnx4008_wdd);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/rc32434_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ static int rc32434_wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
static int rc32434_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&rc32434_wdt_miscdev);
iounmap(wdt_reg);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/rdc321x_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
return 0;
}

static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
static int rdc321x_wdt_remove(struct platform_device *pdev)
{
if (rdc321x_wdt_device.queue) {
rdc321x_wdt_device.queue = 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/riowd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static int riowd_probe(struct platform_device *op)
return err;
}

static int __devexit riowd_remove(struct platform_device *op)
static int riowd_remove(struct platform_device *op)
{
struct riowd *p = dev_get_drvdata(&op->dev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/s3c2410_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
return ret;
}

static int __devexit s3c2410wdt_remove(struct platform_device *dev)
static int s3c2410wdt_remove(struct platform_device *dev)
{
watchdog_unregister_device(&s3c2410_wdd);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/sch311x_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ static int sch311x_wdt_probe(struct platform_device *pdev)
return err;
}

static int __devexit sch311x_wdt_remove(struct platform_device *pdev)
static int sch311x_wdt_remove(struct platform_device *pdev)
{
/* Stop the timer before we leave */
if (!nowayout)
Expand Down
Loading

0 comments on commit 609f77b

Please sign in to comment.