aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:22:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 15:55:19 -0500
commit2223cbec33ef3a26e7678be89de75cb60c4c257b (patch)
tree482eba58cfed13ff4295f18849e1926e3ef8b2f5 /drivers/char
parent4dde2d2f3a3b09d282eb399d24fb261ae50425ef (diff)
char: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Geoff Levand <geoff@infradead.org> Cc: Mattia Dongili <malattia@linux.it> Cc: Amit Shah <amit.shah@redhat.com> Cc: openipmi-developer@lists.sourceforge.net Cc: linuxppc-dev@lists.ozlabs.org Cc: cbe-oss-dev@lists.ozlabs.org Cc: platform-driver-x86@vger.kernel.org Cc: virtualization@lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c24
-rw-r--r--drivers/char/ps3flash.c2
-rw-r--r--drivers/char/sonypi.c10
-rw-r--r--drivers/char/tb0219.c2
-rw-r--r--drivers/char/virtio_console.c2
-rw-r--r--drivers/char/xilinx_hwicap/xilinx_hwicap.c6
6 files changed, 23 insertions, 23 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 32a6c7e256bd..1a465a4974f8 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1836,7 +1836,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
1836 return rv; 1836 return rv;
1837} 1837}
1838 1838
1839static int __devinit hardcode_find_bmc(void) 1839static int hardcode_find_bmc(void)
1840{ 1840{
1841 int ret = -ENODEV; 1841 int ret = -ENODEV;
1842 int i; 1842 int i;
@@ -2023,7 +2023,7 @@ struct SPMITable {
2023 s8 spmi_id[1]; /* A '\0' terminated array starts here. */ 2023 s8 spmi_id[1]; /* A '\0' terminated array starts here. */
2024}; 2024};
2025 2025
2026static int __devinit try_init_spmi(struct SPMITable *spmi) 2026static int try_init_spmi(struct SPMITable *spmi)
2027{ 2027{
2028 struct smi_info *info; 2028 struct smi_info *info;
2029 2029
@@ -2106,7 +2106,7 @@ static int __devinit try_init_spmi(struct SPMITable *spmi)
2106 return 0; 2106 return 0;
2107} 2107}
2108 2108
2109static void __devinit spmi_find_bmc(void) 2109static void spmi_find_bmc(void)
2110{ 2110{
2111 acpi_status status; 2111 acpi_status status;
2112 struct SPMITable *spmi; 2112 struct SPMITable *spmi;
@@ -2128,7 +2128,7 @@ static void __devinit spmi_find_bmc(void)
2128 } 2128 }
2129} 2129}
2130 2130
2131static int __devinit ipmi_pnp_probe(struct pnp_dev *dev, 2131static int ipmi_pnp_probe(struct pnp_dev *dev,
2132 const struct pnp_device_id *dev_id) 2132 const struct pnp_device_id *dev_id)
2133{ 2133{
2134 struct acpi_device *acpi_dev; 2134 struct acpi_device *acpi_dev;
@@ -2258,7 +2258,7 @@ struct dmi_ipmi_data {
2258 u8 slave_addr; 2258 u8 slave_addr;
2259}; 2259};
2260 2260
2261static int __devinit decode_dmi(const struct dmi_header *dm, 2261static int decode_dmi(const struct dmi_header *dm,
2262 struct dmi_ipmi_data *dmi) 2262 struct dmi_ipmi_data *dmi)
2263{ 2263{
2264 const u8 *data = (const u8 *)dm; 2264 const u8 *data = (const u8 *)dm;
@@ -2320,7 +2320,7 @@ static int __devinit decode_dmi(const struct dmi_header *dm,
2320 return 0; 2320 return 0;
2321} 2321}
2322 2322
2323static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data) 2323static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
2324{ 2324{
2325 struct smi_info *info; 2325 struct smi_info *info;
2326 2326
@@ -2388,7 +2388,7 @@ static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
2388 kfree(info); 2388 kfree(info);
2389} 2389}
2390 2390
2391static void __devinit dmi_find_bmc(void) 2391static void dmi_find_bmc(void)
2392{ 2392{
2393 const struct dmi_device *dev = NULL; 2393 const struct dmi_device *dev = NULL;
2394 struct dmi_ipmi_data data; 2394 struct dmi_ipmi_data data;
@@ -2424,7 +2424,7 @@ static void ipmi_pci_cleanup(struct smi_info *info)
2424 pci_disable_device(pdev); 2424 pci_disable_device(pdev);
2425} 2425}
2426 2426
2427static int __devinit ipmi_pci_probe_regspacing(struct smi_info *info) 2427static int ipmi_pci_probe_regspacing(struct smi_info *info)
2428{ 2428{
2429 if (info->si_type == SI_KCS) { 2429 if (info->si_type == SI_KCS) {
2430 unsigned char status; 2430 unsigned char status;
@@ -2456,7 +2456,7 @@ static int __devinit ipmi_pci_probe_regspacing(struct smi_info *info)
2456 return DEFAULT_REGSPACING; 2456 return DEFAULT_REGSPACING;
2457} 2457}
2458 2458
2459static int __devinit ipmi_pci_probe(struct pci_dev *pdev, 2459static int ipmi_pci_probe(struct pci_dev *pdev,
2460 const struct pci_device_id *ent) 2460 const struct pci_device_id *ent)
2461{ 2461{
2462 int rv; 2462 int rv;
@@ -2551,7 +2551,7 @@ static struct pci_driver ipmi_pci_driver = {
2551#endif /* CONFIG_PCI */ 2551#endif /* CONFIG_PCI */
2552 2552
2553static struct of_device_id ipmi_match[]; 2553static struct of_device_id ipmi_match[];
2554static int __devinit ipmi_probe(struct platform_device *dev) 2554static int ipmi_probe(struct platform_device *dev)
2555{ 2555{
2556#ifdef CONFIG_OF 2556#ifdef CONFIG_OF
2557 const struct of_device_id *match; 2557 const struct of_device_id *match;
@@ -3059,7 +3059,7 @@ static __devinitdata struct ipmi_default_vals
3059 { .port = 0 } 3059 { .port = 0 }
3060}; 3060};
3061 3061
3062static void __devinit default_find_bmc(void) 3062static void default_find_bmc(void)
3063{ 3063{
3064 struct smi_info *info; 3064 struct smi_info *info;
3065 int i; 3065 int i;
@@ -3359,7 +3359,7 @@ static int try_smi_init(struct smi_info *new_smi)
3359 return rv; 3359 return rv;
3360} 3360}
3361 3361
3362static int __devinit init_ipmi_si(void) 3362static int init_ipmi_si(void)
3363{ 3363{
3364 int i; 3364 int i;
3365 char *str; 3365 char *str;
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index 6abdde4da2b7..588063ac9517 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -363,7 +363,7 @@ static struct miscdevice ps3flash_misc = {
363 .fops = &ps3flash_fops, 363 .fops = &ps3flash_fops,
364}; 364};
365 365
366static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev) 366static int ps3flash_probe(struct ps3_system_bus_device *_dev)
367{ 367{
368 struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core); 368 struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
369 struct ps3flash_private *priv; 369 struct ps3flash_private *priv;
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 34f0db34fcd3..861efa48c696 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1164,7 +1164,7 @@ static struct acpi_driver sonypi_acpi_driver = {
1164}; 1164};
1165#endif 1165#endif
1166 1166
1167static int __devinit sonypi_create_input_devices(struct platform_device *pdev) 1167static int sonypi_create_input_devices(struct platform_device *pdev)
1168{ 1168{
1169 struct input_dev *jog_dev; 1169 struct input_dev *jog_dev;
1170 struct input_dev *key_dev; 1170 struct input_dev *key_dev;
@@ -1225,7 +1225,7 @@ static int __devinit sonypi_create_input_devices(struct platform_device *pdev)
1225 return error; 1225 return error;
1226} 1226}
1227 1227
1228static int __devinit sonypi_setup_ioports(struct sonypi_device *dev, 1228static int sonypi_setup_ioports(struct sonypi_device *dev,
1229 const struct sonypi_ioport_list *ioport_list) 1229 const struct sonypi_ioport_list *ioport_list)
1230{ 1230{
1231 /* try to detect if sony-laptop is being used and thus 1231 /* try to detect if sony-laptop is being used and thus
@@ -1265,7 +1265,7 @@ static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
1265 return -EBUSY; 1265 return -EBUSY;
1266} 1266}
1267 1267
1268static int __devinit sonypi_setup_irq(struct sonypi_device *dev, 1268static int sonypi_setup_irq(struct sonypi_device *dev,
1269 const struct sonypi_irq_list *irq_list) 1269 const struct sonypi_irq_list *irq_list)
1270{ 1270{
1271 while (irq_list->irq) { 1271 while (irq_list->irq) {
@@ -1282,7 +1282,7 @@ static int __devinit sonypi_setup_irq(struct sonypi_device *dev,
1282 return -EBUSY; 1282 return -EBUSY;
1283} 1283}
1284 1284
1285static void __devinit sonypi_display_info(void) 1285static void sonypi_display_info(void)
1286{ 1286{
1287 printk(KERN_INFO "sonypi: detected type%d model, " 1287 printk(KERN_INFO "sonypi: detected type%d model, "
1288 "verbose = %d, fnkeyinit = %s, camera = %s, " 1288 "verbose = %d, fnkeyinit = %s, camera = %s, "
@@ -1304,7 +1304,7 @@ static void __devinit sonypi_display_info(void)
1304 sonypi_misc_device.minor); 1304 sonypi_misc_device.minor);
1305} 1305}
1306 1306
1307static int __devinit sonypi_probe(struct platform_device *dev) 1307static int sonypi_probe(struct platform_device *dev)
1308{ 1308{
1309 const struct sonypi_ioport_list *ioport_list; 1309 const struct sonypi_ioport_list *ioport_list;
1310 const struct sonypi_irq_list *irq_list; 1310 const struct sonypi_irq_list *irq_list;
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index 6bfe2af844eb..76e3aea27ff7 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -284,7 +284,7 @@ static void tb0219_pci_irq_init(void)
284 vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW); 284 vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
285} 285}
286 286
287static int __devinit tb0219_probe(struct platform_device *dev) 287static int tb0219_probe(struct platform_device *dev)
288{ 288{
289 int retval; 289 int retval;
290 290
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 8ab9c3d4bf13..90493d4ead1f 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1846,7 +1846,7 @@ static void remove_controlq_data(struct ports_device *portdev)
1846 * config space to see how many ports the host has spawned. We 1846 * config space to see how many ports the host has spawned. We
1847 * initialize each port found. 1847 * initialize each port found.
1848 */ 1848 */
1849static int __devinit virtcons_probe(struct virtio_device *vdev) 1849static int virtcons_probe(struct virtio_device *vdev)
1850{ 1850{
1851 struct ports_device *portdev; 1851 struct ports_device *portdev;
1852 int err; 1852 int err;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 2c5d15beea35..547ed74e3d12 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -595,7 +595,7 @@ static const struct file_operations hwicap_fops = {
595 .llseek = noop_llseek, 595 .llseek = noop_llseek,
596}; 596};
597 597
598static int __devinit hwicap_setup(struct device *dev, int id, 598static int hwicap_setup(struct device *dev, int id,
599 const struct resource *regs_res, 599 const struct resource *regs_res,
600 const struct hwicap_driver_config *config, 600 const struct hwicap_driver_config *config,
601 const struct config_registers *config_regs) 601 const struct config_registers *config_regs)
@@ -740,7 +740,7 @@ static int __devexit hwicap_remove(struct device *dev)
740} 740}
741 741
742#ifdef CONFIG_OF 742#ifdef CONFIG_OF
743static int __devinit hwicap_of_probe(struct platform_device *op, 743static int hwicap_of_probe(struct platform_device *op,
744 const struct hwicap_driver_config *config) 744 const struct hwicap_driver_config *config)
745{ 745{
746 struct resource res; 746 struct resource res;
@@ -786,7 +786,7 @@ static inline int hwicap_of_probe(struct platform_device *op,
786#endif /* CONFIG_OF */ 786#endif /* CONFIG_OF */
787 787
788static const struct of_device_id __devinitconst hwicap_of_match[]; 788static const struct of_device_id __devinitconst hwicap_of_match[];
789static int __devinit hwicap_drv_probe(struct platform_device *pdev) 789static int hwicap_drv_probe(struct platform_device *pdev)
790{ 790{
791 const struct of_device_id *match; 791 const struct of_device_id *match;
792 struct resource *res; 792 struct resource *res;