apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files
drivers/watchdog/acquirewdt.c
+1 -1
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;
drivers/watchdog/advantechwdt.c
+1 -1
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;
drivers/watchdog/ar7_wdt.c
+1 -1
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;
drivers/watchdog/at91rm9200_wdt.c
+1 -1
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;
drivers/watchdog/ath79_wdt.c
+1 -1
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;
drivers/watchdog/bcm63xx_wdt.c
+1 -1
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;
drivers/watchdog/bfin_wdt.c
+1 -1
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;
drivers/watchdog/cpu5wdt.c
+2 -2
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();
} }
drivers/watchdog/cpwd.c
+1 -1
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;
drivers/watchdog/da9052_wdt.c
+1 -1
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;
drivers/watchdog/davinci_wdt.c
+1 -1
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;
drivers/watchdog/dw_wdt.c
+1 -1
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);
drivers/watchdog/ep93xx_wdt.c
+1 -1
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;
drivers/watchdog/gef_wdt.c
+1 -1
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;
drivers/watchdog/geodewdt.c
+1 -1
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;
drivers/watchdog/hpwdt.c
+13 -13
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;
drivers/watchdog/i6300esb.c
+3 -3
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;
drivers/watchdog/iTCO_wdt.c
+1 -1
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;
drivers/watchdog/ib700wdt.c
+1 -1
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;
drivers/watchdog/ie6xx_wdt.c
+3 -3
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;

Some files were not shown because too many files have changed in this diff Show More