leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: remove use of __devinit

Browse Source 
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-11-19 13:21:41 -05:00 committed by Greg Kroah-Hartman
parent 82268714bd
commit 2d991a164a
52 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/acquirewdt.c
View File

@ -240,7 +240,7 @@ static struct miscdevice acq_miscdev = {
* Init & exit routines * Init & exit routines
*/ */
static int __devinit acq_probe(struct platform_device *dev) static int acq_probe(struct platform_device *dev)
{ {
int ret; int ret;

2
drivers/watchdog/advantechwdt.c
View File

@ -238,7 +238,7 @@ static struct miscdevice advwdt_miscdev = {
* Init & exit routines * Init & exit routines
*/ */
static int __devinit advwdt_probe(struct platform_device *dev) static int advwdt_probe(struct platform_device *dev)
{ {
int ret; int ret;

2
drivers/watchdog/ar7_wdt.c
View File

@ -274,7 +274,7 @@ static struct miscdevice ar7_wdt_miscdev = {
.fops = &ar7_wdt_fops, .fops = &ar7_wdt_fops,
}; };
static int __devinit ar7_wdt_probe(struct platform_device *pdev) static int ar7_wdt_probe(struct platform_device *pdev)
{ {
int rc; int rc;

2
drivers/watchdog/at91rm9200_wdt.c
View File

@ -199,7 +199,7 @@ static struct miscdevice at91wdt_miscdev = {
.fops = &at91wdt_fops, .fops = &at91wdt_fops,
}; };
static int __devinit at91wdt_probe(struct platform_device *pdev) static int at91wdt_probe(struct platform_device *pdev)
{ {
int res; int res;

2
drivers/watchdog/ath79_wdt.c
View File

@ -224,7 +224,7 @@ static struct miscdevice ath79_wdt_miscdev = {
.fops = &ath79_wdt_fops, .fops = &ath79_wdt_fops,
}; };
static int __devinit ath79_wdt_probe(struct platform_device *pdev) static int ath79_wdt_probe(struct platform_device *pdev)
{ {
u32 ctrl; u32 ctrl;
int err; int err;

2
drivers/watchdog/bcm63xx_wdt.c
View File

@ -236,7 +236,7 @@ static struct miscdevice bcm63xx_wdt_miscdev = {
}; };
static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev) static int bcm63xx_wdt_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct resource *r; struct resource *r;

2
drivers/watchdog/bfin_wdt.c
View File

@ -356,7 +356,7 @@ static const struct watchdog_info bfin_wdt_info = {
* Registers the misc device. Actual device * Registers the misc device. Actual device
* initialization is handled by bfin_wdt_open(). * initialization is handled by bfin_wdt_open().
*/ */
static int __devinit bfin_wdt_probe(struct platform_device *pdev) static int bfin_wdt_probe(struct platform_device *pdev)
{ {
int ret; int ret;

4
drivers/watchdog/cpu5wdt.c
View File

@ -215,7 +215,7 @@ static struct miscdevice cpu5wdt_misc = {
/* init/exit function */ /* init/exit function */
static int __devinit cpu5wdt_init(void) static int cpu5wdt_init(void)
{ {
unsigned int val; unsigned int val;
int err; int err;
@ -256,7 +256,7 @@ no_port:
return err; return err;
} }
static int __devinit cpu5wdt_init_module(void) static int cpu5wdt_init_module(void)
{ {
return cpu5wdt_init(); return cpu5wdt_init();
} }

2
drivers/watchdog/cpwd.c
View File

@ -528,7 +528,7 @@ static const struct file_operations cpwd_fops = {
.llseek = no_llseek, .llseek = no_llseek,
}; };
static int __devinit cpwd_probe(struct platform_device *op) static int cpwd_probe(struct platform_device *op)
{ {
struct device_node *options; struct device_node *options;
const char *str_prop; const char *str_prop;

2
drivers/watchdog/da9052_wdt.c
View File

@ -179,7 +179,7 @@ static const struct watchdog_ops da9052_wdt_ops = {
}; };
static int __devinit da9052_wdt_probe(struct platform_device *pdev) static int da9052_wdt_probe(struct platform_device *pdev)
{ {
struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent); struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);
struct da9052_wdt_data *driver_data; struct da9052_wdt_data *driver_data;

2
drivers/watchdog/davinci_wdt.c
View File

@ -199,7 +199,7 @@ static struct miscdevice davinci_wdt_miscdev = {
.fops = &davinci_wdt_fops, .fops = &davinci_wdt_fops,
}; };
static int __devinit davinci_wdt_probe(struct platform_device *pdev) static int davinci_wdt_probe(struct platform_device *pdev)
{ {
int ret = 0, size; int ret = 0, size;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;

2
drivers/watchdog/dw_wdt.c
View File

@ -293,7 +293,7 @@ static struct miscdevice dw_wdt_miscdev = {
.minor = WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
}; };
static int __devinit dw_wdt_drv_probe(struct platform_device *pdev) static int dw_wdt_drv_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

2
drivers/watchdog/ep93xx_wdt.c
View File

@ -112,7 +112,7 @@ static struct watchdog_device ep93xx_wdt_wdd = {
.ops = &ep93xx_wdt_ops, .ops = &ep93xx_wdt_ops,
}; };
static int __devinit ep93xx_wdt_probe(struct platform_device *pdev) static int ep93xx_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
unsigned long val; unsigned long val;

2
drivers/watchdog/gef_wdt.c
View File

@ -262,7 +262,7 @@ static struct miscdevice gef_wdt_miscdev = {
}; };
static int __devinit gef_wdt_probe(struct platform_device *dev) static int gef_wdt_probe(struct platform_device *dev)
{ {
int timeout = 10; int timeout = 10;
u32 freq; u32 freq;

2
drivers/watchdog/geodewdt.c
View File

@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscdev = {
.fops = &geodewdt_fops, .fops = &geodewdt_fops,
}; };
static int __devinit geodewdt_probe(struct platform_device *dev) static int geodewdt_probe(struct platform_device *dev)
{ {
int ret; int ret;

26
drivers/watchdog/hpwdt.c
View File

@ -212,7 +212,7 @@ asm(".text \n\t"
* 0 : SUCCESS * 0 : SUCCESS
* <0 : FAILURE * <0 : FAILURE
*/ */
static int __devinit cru_detect(unsigned long map_entry, static int cru_detect(unsigned long map_entry,
unsigned long map_offset) unsigned long map_offset)
{ {
void *bios32_map; void *bios32_map;
@ -268,7 +268,7 @@ static int __devinit cru_detect(unsigned long map_entry,
/* /*
* bios_checksum * bios_checksum
*/ */
static int __devinit bios_checksum(const char __iomem *ptr, int len) static int bios_checksum(const char __iomem *ptr, int len)
{ {
char sum = 0; char sum = 0;
int i; int i;
@ -293,7 +293,7 @@ static int __devinit bios_checksum(const char __iomem *ptr, int len)
* 0 : SUCCESS * 0 : SUCCESS
* <0 : FAILURE * <0 : FAILURE
*/ */
static int __devinit bios32_present(const char __iomem *p) static int bios32_present(const char __iomem *p)
{ {
struct bios32_service_dir *bios_32_ptr; struct bios32_service_dir *bios_32_ptr;
int length; int length;
@ -323,7 +323,7 @@ static int __devinit bios32_present(const char __iomem *p)
return -ENODEV; return -ENODEV;
} }
static int __devinit detect_cru_service(void) static int detect_cru_service(void)
{ {
char __iomem *p, *q; char __iomem *p, *q;
int rc = -1; int rc = -1;
@ -395,7 +395,7 @@ asm(".text \n\t"
* This function checks whether or not a SMBIOS/DMI record is * This function checks whether or not a SMBIOS/DMI record is
* the 64bit CRU info or not * the 64bit CRU info or not
*/ */
static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy) static void dmi_find_cru(const struct dmi_header *dm, void *dummy)
{ {
struct smbios_cru64_info *smbios_cru64_ptr; struct smbios_cru64_info *smbios_cru64_ptr;
unsigned long cru_physical_address; unsigned long cru_physical_address;
@ -414,7 +414,7 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy)
} }
} }
static int __devinit detect_cru_service(void) static int detect_cru_service(void)
{ {
cru_rom_addr = NULL; cru_rom_addr = NULL;
@ -647,7 +647,7 @@ static struct miscdevice hpwdt_miscdev = {
#ifdef CONFIG_HPWDT_NMI_DECODING #ifdef CONFIG_HPWDT_NMI_DECODING
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
{ {
/* /*
* If nmi_watchdog is turned off then we can turn on * If nmi_watchdog is turned off then we can turn on
@ -656,7 +656,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
hpwdt_nmi_decoding = 1; hpwdt_nmi_decoding = 1;
} }
#else #else
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
{ {
dev_warn(&dev->dev, "NMI decoding is disabled. " dev_warn(&dev->dev, "NMI decoding is disabled. "
"Your kernel does not support a NMI Watchdog.\n"); "Your kernel does not support a NMI Watchdog.\n");
@ -671,7 +671,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
* This check is independent of architecture and needs to be made for * This check is independent of architecture and needs to be made for
* any ProLiant system. * any ProLiant system.
*/ */
static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy) static void dmi_find_icru(const struct dmi_header *dm, void *dummy)
{ {
struct smbios_proliant_info *smbios_proliant_ptr; struct smbios_proliant_info *smbios_proliant_ptr;
@ -682,7 +682,7 @@ static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy)
} }
} }
static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
{ {
int retval; int retval;
@ -762,11 +762,11 @@ static void hpwdt_exit_nmi_decoding(void)
iounmap(cru_rom_addr); iounmap(cru_rom_addr);
} }
#else /* !CONFIG_HPWDT_NMI_DECODING */ #else /* !CONFIG_HPWDT_NMI_DECODING */
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
{ {
} }
static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
{ {
return 0; return 0;
} }
@ -776,7 +776,7 @@ static void hpwdt_exit_nmi_decoding(void)
} }
#endif /* CONFIG_HPWDT_NMI_DECODING */ #endif /* CONFIG_HPWDT_NMI_DECODING */
static int __devinit hpwdt_init_one(struct pci_dev *dev, static int hpwdt_init_one(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int retval; int retval;

6
drivers/watchdog/i6300esb.c
View File

@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(pci, esb_pci_tbl);
* Init & exit routines * Init & exit routines
*/ */
static unsigned char __devinit esb_getdevice(struct pci_dev *pdev) static unsigned char esb_getdevice(struct pci_dev *pdev)
{ {
if (pci_enable_device(pdev)) { if (pci_enable_device(pdev)) {
pr_err("failed to enable device\n"); pr_err("failed to enable device\n");
@ -375,7 +375,7 @@ err_devput:
return 0; return 0;
} }
static void __devinit esb_initdevice(void) static void esb_initdevice(void)
{ {
u8 val1; u8 val1;
u16 val2; u16 val2;
@ -416,7 +416,7 @@ static void __devinit esb_initdevice(void)
esb_timer_set_heartbeat(heartbeat); esb_timer_set_heartbeat(heartbeat);
} }
static int __devinit esb_probe(struct pci_dev *pdev, static int esb_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret; int ret;

2
drivers/watchdog/iTCO_wdt.c
View File

@ -390,7 +390,7 @@ static void __devexit iTCO_wdt_cleanup(void)
iTCO_wdt_private.gcs = NULL; iTCO_wdt_private.gcs = NULL;
} }
static int __devinit iTCO_wdt_probe(struct platform_device *dev) static int iTCO_wdt_probe(struct platform_device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
unsigned long val32; unsigned long val32;

2
drivers/watchdog/ib700wdt.c
View File

@ -277,7 +277,7 @@ static struct miscdevice ibwdt_miscdev = {
* Init & exit routines * Init & exit routines
*/ */
static int __devinit ibwdt_probe(struct platform_device *dev) static int ibwdt_probe(struct platform_device *dev)
{ {
int res; int res;

6
drivers/watchdog/ie6xx_wdt.c
View File

@ -225,7 +225,7 @@ static const struct file_operations ie6xx_wdt_dbg_operations = {
.release = single_release, .release = single_release,
}; };
static void __devinit ie6xx_wdt_debugfs_init(void) static void ie6xx_wdt_debugfs_init(void)
{ {
/* /sys/kernel/debug/ie6xx_wdt */ /* /sys/kernel/debug/ie6xx_wdt */
ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt", ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt",
@ -238,7 +238,7 @@ static void ie6xx_wdt_debugfs_exit(void)
} }
#else #else
static void __devinit ie6xx_wdt_debugfs_init(void) static void ie6xx_wdt_debugfs_init(void)
{ {
} }
@ -247,7 +247,7 @@ static void ie6xx_wdt_debugfs_exit(void)
} }
#endif #endif
static int __devinit ie6xx_wdt_probe(struct platform_device *pdev) static int ie6xx_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
u8 wdtlr; u8 wdtlr;

2
drivers/watchdog/jz4740_wdt.c
View File

@ -144,7 +144,7 @@ static const struct watchdog_ops jz4740_wdt_ops = {
.set_timeout = jz4740_wdt_set_timeout, .set_timeout = jz4740_wdt_set_timeout,
}; };
static int __devinit jz4740_wdt_probe(struct platform_device *pdev) static int jz4740_wdt_probe(struct platform_device *pdev)
{ {
struct jz4740_wdt_drvdata *drvdata; struct jz4740_wdt_drvdata *drvdata;
struct watchdog_device *jz4740_wdt; struct watchdog_device *jz4740_wdt;

2
drivers/watchdog/ks8695_wdt.c
View File

@ -235,7 +235,7 @@ static struct miscdevice ks8695wdt_miscdev = {
.fops = &ks8695wdt_fops, .fops = &ks8695wdt_fops,
}; };
static int __devinit ks8695wdt_probe(struct platform_device *pdev) static int ks8695wdt_probe(struct platform_device *pdev)
{ {
int res; int res;

2
drivers/watchdog/lantiq_wdt.c
View File

@ -186,7 +186,7 @@ static struct miscdevice ltq_wdt_miscdev = {
.fops = &ltq_wdt_fops, .fops = &ltq_wdt_fops,
}; };
static int __devinit static int
ltq_wdt_probe(struct platform_device *pdev) ltq_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

2
drivers/watchdog/max63xx_wdt.c
View File

@ -174,7 +174,7 @@ static struct watchdog_device max63xx_wdt_dev = {
.ops = &max63xx_wdt_ops, .ops = &max63xx_wdt_ops,
}; };
static int __devinit max63xx_wdt_probe(struct platform_device *pdev) static int max63xx_wdt_probe(struct platform_device *pdev)
{ {
struct resource *wdt_mem; struct resource *wdt_mem;
struct max63xx_timeout *table; struct max63xx_timeout *table;

2
drivers/watchdog/mpc8xxx_wdt.c
View File

@ -188,7 +188,7 @@ static struct miscdevice mpc8xxx_wdt_miscdev = {
}; };
static const struct of_device_id mpc8xxx_wdt_match[]; static const struct of_device_id mpc8xxx_wdt_match[];
static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev) static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
{ {
int ret; int ret;
const struct of_device_id *match; const struct of_device_id *match;

2
drivers/watchdog/mpcore_wdt.c
View File

@ -327,7 +327,7 @@ static struct miscdevice mpcore_wdt_miscdev = {
.fops = &mpcore_wdt_fops, .fops = &mpcore_wdt_fops,
}; };
static int __devinit mpcore_wdt_probe(struct platform_device *pdev) static int mpcore_wdt_probe(struct platform_device *pdev)
{ {
struct mpcore_wdt *wdt; struct mpcore_wdt *wdt;
struct resource *res; struct resource *res;

2
drivers/watchdog/mtx-1_wdt.c
View File

@ -204,7 +204,7 @@ static struct miscdevice mtx1_wdt_misc = {
}; };
static int __devinit mtx1_wdt_probe(struct platform_device *pdev) static int mtx1_wdt_probe(struct platform_device *pdev)
{ {
int ret; int ret;

2
drivers/watchdog/mv64x60_wdt.c
View File

@ -253,7 +253,7 @@ static struct miscdevice mv64x60_wdt_miscdev = {
.fops = &mv64x60_wdt_fops, .fops = &mv64x60_wdt_fops,
}; };
static int __devinit mv64x60_wdt_probe(struct platform_device *dev) static int mv64x60_wdt_probe(struct platform_device *dev)
{ {
struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data; struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
struct resource *r; struct resource *r;

2
drivers/watchdog/nuc900_wdt.c
View File

@ -242,7 +242,7 @@ static struct miscdevice nuc900wdt_miscdev = {
.fops = &nuc900wdt_fops, .fops = &nuc900wdt_fops,
}; };
static int __devinit nuc900wdt_probe(struct platform_device *pdev) static int nuc900wdt_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;

4
drivers/watchdog/nv_tco.c
View File

@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, tco_pci_tbl);
* Init & exit routines * Init & exit routines
*/ */
static unsigned char __devinit nv_tco_getdevice(void) static unsigned char nv_tco_getdevice(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
u32 val; u32 val;
@ -376,7 +376,7 @@ out:
return 0; return 0;
} }
static int __devinit nv_tco_init(struct platform_device *dev) static int nv_tco_init(struct platform_device *dev)
{ {
int ret; int ret;

2
drivers/watchdog/of_xilinx_wdt.c
View File

@ -289,7 +289,7 @@ static struct miscdevice xwdt_miscdev = {
.fops = &xwdt_fops, .fops = &xwdt_fops,
}; };
static int __devinit xwdt_probe(struct platform_device *pdev) static int xwdt_probe(struct platform_device *pdev)
{ {
int rc; int rc;
u32 *tmptr; u32 *tmptr;

2
drivers/watchdog/omap_wdt.c
View File

@ -264,7 +264,7 @@ static const struct file_operations omap_wdt_fops = {
.llseek = no_llseek, .llseek = no_llseek,
}; };
static int __devinit omap_wdt_probe(struct platform_device *pdev) static int omap_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res, *mem; struct resource *res, *mem;
struct omap_wdt_dev *wdev; struct omap_wdt_dev *wdev;

2
drivers/watchdog/orion_wdt.c
View File

@ -142,7 +142,7 @@ static struct watchdog_device orion_wdt = {
.ops = &orion_wdt_ops, .ops = &orion_wdt_ops,
}; };
static int __devinit orion_wdt_probe(struct platform_device *pdev) static int orion_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
int ret; int ret;

4
drivers/watchdog/pcwd.c
View File

@ -801,7 +801,7 @@ static inline int get_revision(void)
* The initial rate is once per second at board start up, then twice * The initial rate is once per second at board start up, then twice
* per second for normal operation. * per second for normal operation.
*/ */
static int __devinit pcwd_isa_match(struct device *dev, unsigned int id) static int pcwd_isa_match(struct device *dev, unsigned int id)
{ {
int base_addr = pcwd_ioports[id]; int base_addr = pcwd_ioports[id];
int port0, last_port0; /* Reg 0, in case it's REV A */ int port0, last_port0; /* Reg 0, in case it's REV A */
@ -846,7 +846,7 @@ static int __devinit pcwd_isa_match(struct device *dev, unsigned int id)
return retval; return retval;
} }
static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id) static int pcwd_isa_probe(struct device *dev, unsigned int id)
{ {
int ret; int ret;

2
drivers/watchdog/pcwd_pci.c
View File

@ -682,7 +682,7 @@ static struct notifier_block pcipcwd_notifier = {
* Init & exit routines * Init & exit routines
*/ */
static int __devinit pcipcwd_card_init(struct pci_dev *pdev, static int pcipcwd_card_init(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret = -EIO; int ret = -EIO;

2
drivers/watchdog/pnx4008_wdt.c
View File

@ -146,7 +146,7 @@ static struct watchdog_device pnx4008_wdd = {
.max_timeout = MAX_HEARTBEAT, .max_timeout = MAX_HEARTBEAT,
}; };
static int __devinit pnx4008_wdt_probe(struct platform_device *pdev) static int pnx4008_wdt_probe(struct platform_device *pdev)
{ {
struct resource *r; struct resource *r;
int ret = 0; int ret = 0;

2
drivers/watchdog/rc32434_wdt.c
View File

@ -260,7 +260,7 @@ static struct miscdevice rc32434_wdt_miscdev = {
.fops = &rc32434_wdt_fops, .fops = &rc32434_wdt_fops,
}; };
static int __devinit rc32434_wdt_probe(struct platform_device *pdev) static int rc32434_wdt_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct resource *r; struct resource *r;

2
drivers/watchdog/rdc321x_wdt.c
View File

@ -225,7 +225,7 @@ static struct miscdevice rdc321x_wdt_misc = {
.fops = &rdc321x_wdt_fops, .fops = &rdc321x_wdt_fops,
}; };
static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) static int rdc321x_wdt_probe(struct platform_device *pdev)
{ {
int err; int err;
struct resource *r; struct resource *r;

2
drivers/watchdog/riowd.c
View File

@ -174,7 +174,7 @@ static struct miscdevice riowd_miscdev = {
.fops = &riowd_fops .fops = &riowd_fops
}; };
static int __devinit riowd_probe(struct platform_device *op) static int riowd_probe(struct platform_device *op)
{ {
struct riowd *p; struct riowd *p;
int err = -EINVAL; int err = -EINVAL;

2
drivers/watchdog/s3c2410_wdt.c
View File

@ -303,7 +303,7 @@ static inline void s3c2410wdt_cpufreq_deregister(void)
} }
#endif #endif
static int __devinit s3c2410wdt_probe(struct platform_device *pdev) static int s3c2410wdt_probe(struct platform_device *pdev)
{ {
struct device *dev; struct device *dev;
unsigned int wtcon; unsigned int wtcon;

2
drivers/watchdog/sch311x_wdt.c
View File

@ -356,7 +356,7 @@ static struct miscdevice sch311x_wdt_miscdev = {
* Init & exit routines * Init & exit routines
*/ */
static int __devinit sch311x_wdt_probe(struct platform_device *pdev) static int sch311x_wdt_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int err; int err;

2
drivers/watchdog/shwdt.c
View File

@ -217,7 +217,7 @@ static struct watchdog_device sh_wdt_dev = {
.ops = &sh_wdt_ops, .ops = &sh_wdt_ops,
}; };
static int __devinit sh_wdt_probe(struct platform_device *pdev) static int sh_wdt_probe(struct platform_device *pdev)
{ {
struct sh_wdt *wdt; struct sh_wdt *wdt;
struct resource *res; struct resource *res;

4
drivers/watchdog/sp5100_tco.c
View File

@ -271,7 +271,7 @@ MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
* Init & exit routines * Init & exit routines
*/ */
static unsigned char __devinit sp5100_tco_setupdevice(void) static unsigned char sp5100_tco_setupdevice(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
u32 val; u32 val;
@ -361,7 +361,7 @@ exit:
return 0; return 0;
} }
static int __devinit sp5100_tco_init(struct platform_device *dev) static int sp5100_tco_init(struct platform_device *dev)
{ {
int ret; int ret;
u32 val; u32 val;

2
drivers/watchdog/sp805_wdt.c
View File

@ -210,7 +210,7 @@ static const struct watchdog_ops wdt_ops = {
.get_timeleft = wdt_timeleft, .get_timeleft = wdt_timeleft,
}; };
static int __devinit static int
sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
{ {
struct sp805_wdt *wdt; struct sp805_wdt *wdt;

2
drivers/watchdog/stmp3xxx_wdt.c
View File

@ -204,7 +204,7 @@ static struct miscdevice stmp3xxx_wdt_miscdev = {
.fops = &stmp3xxx_wdt_fops, .fops = &stmp3xxx_wdt_fops,
}; };
static int __devinit stmp3xxx_wdt_probe(struct platform_device *pdev) static int stmp3xxx_wdt_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;

2
drivers/watchdog/ts72xx_wdt.c
View File

@ -390,7 +390,7 @@ static struct miscdevice ts72xx_wdt_miscdev = {
.fops = &ts72xx_wdt_fops, .fops = &ts72xx_wdt_fops,
}; };
static __devinit int ts72xx_wdt_probe(struct platform_device *pdev) static int ts72xx_wdt_probe(struct platform_device *pdev)
{ {
struct ts72xx_wdt *wdt; struct ts72xx_wdt *wdt;
struct resource *r1, *r2; struct resource *r1, *r2;

2
drivers/watchdog/twl4030_wdt.c
View File

@ -170,7 +170,7 @@ static const struct file_operations twl4030_wdt_fops = {
.write = twl4030_wdt_write_fop, .write = twl4030_wdt_write_fop,
}; };
static int __devinit twl4030_wdt_probe(struct platform_device *pdev) static int twl4030_wdt_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
struct twl4030_wdt *wdt; struct twl4030_wdt *wdt;

2
drivers/watchdog/via_wdt.c
View File

@ -155,7 +155,7 @@ static struct watchdog_device wdt_dev = {
.max_timeout = WDT_TIMEOUT_MAX, .max_timeout = WDT_TIMEOUT_MAX,
}; };
static int __devinit wdt_probe(struct pci_dev *pdev, static int wdt_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned char conf; unsigned char conf;

2
drivers/watchdog/wdt_pci.c
View File

@ -605,7 +605,7 @@ static struct notifier_block wdtpci_notifier = {
}; };
static int __devinit wdtpci_init_one(struct pci_dev *dev, static int wdtpci_init_one(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret = -EIO; int ret = -EIO;

2
drivers/watchdog/wm831x_wdt.c
View File

@ -181,7 +181,7 @@ static const struct watchdog_ops wm831x_wdt_ops = {
.set_timeout = wm831x_wdt_set_timeout, .set_timeout = wm831x_wdt_set_timeout,
}; };
static int __devinit wm831x_wdt_probe(struct platform_device *pdev) static int wm831x_wdt_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *chip_pdata; struct wm831x_pdata *chip_pdata;

2
drivers/watchdog/wm8350_wdt.c
View File

@ -140,7 +140,7 @@ static struct watchdog_device wm8350_wdt = {
.max_timeout = 4, .max_timeout = 4,
}; };
static int __devinit wm8350_wdt_probe(struct platform_device *pdev) static int wm8350_wdt_probe(struct platform_device *pdev)
{ {
struct wm8350 *wm8350 = platform_get_drvdata(pdev); struct wm8350 *wm8350 = platform_get_drvdata(pdev);

2
drivers/watchdog/xen_wdt.c
View File

@ -244,7 +244,7 @@ static struct miscdevice xen_wdt_miscdev = {
.fops = &xen_wdt_fops, .fops = &xen_wdt_fops,
}; };
static int __devinit xen_wdt_probe(struct platform_device *dev) static int xen_wdt_probe(struct platform_device *dev)
{ {
struct sched_watchdog wd = { .id = ~0 }; struct sched_watchdog wd = { .id = ~0 };
int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd); int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd);