Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2223cbec33ef3a26e7678be89de75cb60c4c257b

Authored by Bill Pemberton
Committed by Greg Kroah-Hartman
1 parent 4dde2d2f3a
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 6 changed files with 23 additions and 23 deletions Side-by-side Diff

drivers/char/ipmi/ipmi_si_intf.c
Diff comments   View file @ 2223cbe
... ... @@ -1836,7 +1836,7 @@
1836 1836 return rv;
1837 1837 }
1838 1838  
1839   -static int __devinit hardcode_find_bmc(void)
  1839 +static int hardcode_find_bmc(void)
1840 1840 {
1841 1841 int ret = -ENODEV;
1842 1842 int i;
... ... @@ -2023,7 +2023,7 @@
2023 2023 s8 spmi_id[1]; /* A '\0' terminated array starts here. */
2024 2024 };
2025 2025  
2026   -static int __devinit try_init_spmi(struct SPMITable *spmi)
  2026 +static int try_init_spmi(struct SPMITable *spmi)
2027 2027 {
2028 2028 struct smi_info *info;
2029 2029  
... ... @@ -2106,7 +2106,7 @@
2106 2106 return 0;
2107 2107 }
2108 2108  
2109   -static void __devinit spmi_find_bmc(void)
  2109 +static void spmi_find_bmc(void)
2110 2110 {
2111 2111 acpi_status status;
2112 2112 struct SPMITable *spmi;
... ... @@ -2128,7 +2128,7 @@
2128 2128 }
2129 2129 }
2130 2130  
2131   -static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
  2131 +static int ipmi_pnp_probe(struct pnp_dev *dev,
2132 2132 const struct pnp_device_id *dev_id)
2133 2133 {
2134 2134 struct acpi_device *acpi_dev;
... ... @@ -2258,7 +2258,7 @@
2258 2258 u8 slave_addr;
2259 2259 };
2260 2260  
2261   -static int __devinit decode_dmi(const struct dmi_header *dm,
  2261 +static int decode_dmi(const struct dmi_header *dm,
2262 2262 struct dmi_ipmi_data *dmi)
2263 2263 {
2264 2264 const u8 *data = (const u8 *)dm;
... ... @@ -2320,7 +2320,7 @@
2320 2320 return 0;
2321 2321 }
2322 2322  
2323   -static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
  2323 +static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
2324 2324 {
2325 2325 struct smi_info *info;
2326 2326  
... ... @@ -2388,7 +2388,7 @@
2388 2388 kfree(info);
2389 2389 }
2390 2390  
2391   -static void __devinit dmi_find_bmc(void)
  2391 +static void dmi_find_bmc(void)
2392 2392 {
2393 2393 const struct dmi_device *dev = NULL;
2394 2394 struct dmi_ipmi_data data;
... ... @@ -2424,7 +2424,7 @@
2424 2424 pci_disable_device(pdev);
2425 2425 }
2426 2426  
2427   -static int __devinit ipmi_pci_probe_regspacing(struct smi_info *info)
  2427 +static int ipmi_pci_probe_regspacing(struct smi_info *info)
2428 2428 {
2429 2429 if (info->si_type == SI_KCS) {
2430 2430 unsigned char status;
... ... @@ -2456,7 +2456,7 @@
2456 2456 return DEFAULT_REGSPACING;
2457 2457 }
2458 2458  
2459   -static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
  2459 +static int ipmi_pci_probe(struct pci_dev *pdev,
2460 2460 const struct pci_device_id *ent)
2461 2461 {
2462 2462 int rv;
... ... @@ -2551,7 +2551,7 @@
2551 2551 #endif /* CONFIG_PCI */
2552 2552  
2553 2553 static struct of_device_id ipmi_match[];
2554   -static int __devinit ipmi_probe(struct platform_device *dev)
  2554 +static int ipmi_probe(struct platform_device *dev)
2555 2555 {
2556 2556 #ifdef CONFIG_OF
2557 2557 const struct of_device_id *match;
... ... @@ -3059,7 +3059,7 @@
3059 3059 { .port = 0 }
3060 3060 };
3061 3061  
3062   -static void __devinit default_find_bmc(void)
  3062 +static void default_find_bmc(void)
3063 3063 {
3064 3064 struct smi_info *info;
3065 3065 int i;
... ... @@ -3359,7 +3359,7 @@
3359 3359 return rv;
3360 3360 }
3361 3361  
3362   -static int __devinit init_ipmi_si(void)
  3362 +static int init_ipmi_si(void)
3363 3363 {
3364 3364 int i;
3365 3365 char *str;
drivers/char/ps3flash.c
Diff comments   View file @ 2223cbe
... ... @@ -363,7 +363,7 @@
363 363 .fops = &ps3flash_fops,
364 364 };
365 365  
366   -static int __devinit ps3flash_probe(struct ps3_system_bus_device *_dev)
  366 +static int ps3flash_probe(struct ps3_system_bus_device *_dev)
367 367 {
368 368 struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
369 369 struct ps3flash_private *priv;
drivers/char/sonypi.c
Diff comments   View file @ 2223cbe
... ... @@ -1164,7 +1164,7 @@
1164 1164 };
1165 1165 #endif
1166 1166  
1167   -static int __devinit sonypi_create_input_devices(struct platform_device *pdev)
  1167 +static int sonypi_create_input_devices(struct platform_device *pdev)
1168 1168 {
1169 1169 struct input_dev *jog_dev;
1170 1170 struct input_dev *key_dev;
... ... @@ -1225,7 +1225,7 @@
1225 1225 return error;
1226 1226 }
1227 1227  
1228   -static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
  1228 +static int sonypi_setup_ioports(struct sonypi_device *dev,
1229 1229 const struct sonypi_ioport_list *ioport_list)
1230 1230 {
1231 1231 /* try to detect if sony-laptop is being used and thus
... ... @@ -1265,7 +1265,7 @@
1265 1265 return -EBUSY;
1266 1266 }
1267 1267  
1268   -static int __devinit sonypi_setup_irq(struct sonypi_device *dev,
  1268 +static int sonypi_setup_irq(struct sonypi_device *dev,
1269 1269 const struct sonypi_irq_list *irq_list)
1270 1270 {
1271 1271 while (irq_list->irq) {
... ... @@ -1282,7 +1282,7 @@
1282 1282 return -EBUSY;
1283 1283 }
1284 1284  
1285   -static void __devinit sonypi_display_info(void)
  1285 +static void sonypi_display_info(void)
1286 1286 {
1287 1287 printk(KERN_INFO "sonypi: detected type%d model, "
1288 1288 "verbose = %d, fnkeyinit = %s, camera = %s, "
... ... @@ -1304,7 +1304,7 @@
1304 1304 sonypi_misc_device.minor);
1305 1305 }
1306 1306  
1307   -static int __devinit sonypi_probe(struct platform_device *dev)
  1307 +static int sonypi_probe(struct platform_device *dev)
1308 1308 {
1309 1309 const struct sonypi_ioport_list *ioport_list;
1310 1310 const struct sonypi_irq_list *irq_list;
drivers/char/tb0219.c
Diff comments   View file @ 2223cbe
... ... @@ -284,7 +284,7 @@
284 284 vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
285 285 }
286 286  
287   -static int __devinit tb0219_probe(struct platform_device *dev)
  287 +static int tb0219_probe(struct platform_device *dev)
288 288 {
289 289 int retval;
290 290  
drivers/char/virtio_console.c
Diff comments   View file @ 2223cbe
... ... @@ -1846,7 +1846,7 @@
1846 1846 * config space to see how many ports the host has spawned. We
1847 1847 * initialize each port found.
1848 1848 */
1849   -static int __devinit virtcons_probe(struct virtio_device *vdev)
  1849 +static int virtcons_probe(struct virtio_device *vdev)
1850 1850 {
1851 1851 struct ports_device *portdev;
1852 1852 int err;
drivers/char/xilinx_hwicap/xilinx_hwicap.c
Diff comments   View file @ 2223cbe
... ... @@ -595,7 +595,7 @@
595 595 .llseek = noop_llseek,
596 596 };
597 597  
598   -static int __devinit hwicap_setup(struct device *dev, int id,
  598 +static int hwicap_setup(struct device *dev, int id,
599 599 const struct resource *regs_res,
600 600 const struct hwicap_driver_config *config,
601 601 const struct config_registers *config_regs)
... ... @@ -740,7 +740,7 @@
740 740 }
741 741  
742 742 #ifdef CONFIG_OF
743   -static int __devinit hwicap_of_probe(struct platform_device *op,
  743 +static int hwicap_of_probe(struct platform_device *op,
744 744 const struct hwicap_driver_config *config)
745 745 {
746 746 struct resource res;
... ... @@ -786,7 +786,7 @@
786 786 #endif /* CONFIG_OF */
787 787  
788 788 static const struct of_device_id __devinitconst hwicap_of_match[];
789   -static int __devinit hwicap_drv_probe(struct platform_device *pdev)
  789 +static int hwicap_drv_probe(struct platform_device *pdev)
790 790 {
791 791 const struct of_device_id *match;
792 792 struct resource *res;