History

Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...

Linus Torvalds committed 13 years ago

Commit cff2f742 parents b0885d0 92e9e6d492 files · +2042 −1840Browse files

Unified · Split

492 files
  1. Documentation/firmware_class/README +12 −0
  2. Documentation/zh_CN/arm/kernel_user_helpers.txt +284 −0
  3. Documentation/zh_CN/arm64/memory.txt +7 −7
  4. arch/microblaze/pci/pci-common.c +0 −4
  5. arch/mips/pci/pci.c +0 −2
  6. arch/powerpc/kernel/pci-common.c +0 −4
  7. arch/powerpc/kernel/pci_64.c +0 −4
  8. arch/sh/drivers/pci/pci.c +0 −2
  9. arch/unicore32/kernel/pci.c +0 −2
  10. drivers/acpi/apei/ghes.c +1 −1
  11. drivers/acpi/hed.c +1 −1
  12. drivers/acpi/pci_root.c +1 −1
  13. drivers/base/Kconfig +3 −4
  14. drivers/base/attribute_container.c +1 −1
  15. drivers/base/bus.c +0 −14
  16. drivers/base/core.c +5 −3
  17. drivers/base/devres.c +2 −2
  18. drivers/base/firmware_class.c +40 −12
  19. drivers/base/platform.c +2 −2
  20. drivers/char/tpm/tpm_i2c_infineon.c +2 −2
  21. drivers/char/tpm/tpm_ibmvtpm.c +1 −1
  22. drivers/char/tpm/tpm_infineon.c +2 −2
  23. drivers/char/tpm/tpm_tis.c +1 −1
  24. drivers/clk/clk-max77686.c +3 −3
  25. drivers/clk/clk-wm831x.c +3 −3
  26. drivers/dma/dw_dmac.c +2 −2
  27. drivers/dma/edma.c +2 −2
  28. drivers/dma/fsldma.c +2 −2
  29. drivers/dma/intel_mid_dma.c +2 −2
  30. drivers/dma/ioat/pci.c +1 −1
  31. drivers/dma/iop-adma.c +5 −5
  32. drivers/dma/mmp_pdma.c +3 −3
  33. drivers/dma/mmp_tdma.c +3 −3
  34. drivers/dma/mpc512x_dma.c +2 −2
  35. drivers/dma/mv_xor.c +4 −4
  36. drivers/dma/pch_dma.c +2 −2
  37. drivers/dma/pl330.c +1 −1
  38. drivers/dma/ppc4xx/adma.c +2 −2
  39. drivers/dma/sa11x0-dma.c +3 −3
  40. drivers/dma/sh/shdma.c +3 −3
  41. drivers/dma/sirf-dma.c +2 −2
  42. drivers/dma/tegra20-apb-dma.c +2 −2
  43. drivers/dma/timb_dma.c +1 −1
  44. drivers/firewire/nosy.c +2 −2
  45. drivers/firewire/ohci.c +1 −1
  46. drivers/gpio/gpio-74x164.c +3 −3
  47. drivers/gpio/gpio-ab8500.c +3 −3
  48. drivers/gpio/gpio-adnp.c +5 −5
  49. drivers/gpio/gpio-adp5520.c +3 −3
  50. drivers/gpio/gpio-adp5588.c +3 −3
  51. drivers/gpio/gpio-arizona.c +3 −3
  52. drivers/gpio/gpio-cs5535.c +3 −3
  53. drivers/gpio/gpio-da9052.c +4 −4
  54. drivers/gpio/gpio-em.c +3 −3
  55. drivers/gpio/gpio-ep93xx.c +1 −1
  56. drivers/gpio/gpio-generic.c +3 −3
  57. drivers/gpio/gpio-ich.c +5 −5
  58. drivers/gpio/gpio-janz-ttl.c +5 −5
  59. drivers/gpio/gpio-langwell.c +4 −4
  60. drivers/gpio/gpio-lpc32xx.c +2 −2
  61. drivers/gpio/gpio-max7300.c +3 −3
  62. drivers/gpio/gpio-max7301.c +3 −3
  63. drivers/gpio/gpio-max730x.c +2 −2
  64. drivers/gpio/gpio-max732x.c +4 −4
  65. drivers/gpio/gpio-mc33880.c +3 −3
  66. drivers/gpio/gpio-mcp23s08.c +3 −3
  67. drivers/gpio/gpio-ml-ioh.c +4 −4
  68. drivers/gpio/gpio-mpc5200.c +2 −2
  69. drivers/gpio/gpio-msic.c +1 −1
  70. drivers/gpio/gpio-msm-v2.c +3 −3
  71. drivers/gpio/gpio-mvebu.c +2 −2
  72. drivers/gpio/gpio-mxc.c +2 −2
  73. drivers/gpio/gpio-mxs.c +1 −1
  74. drivers/gpio/gpio-omap.c +3 −3
  75. drivers/gpio/gpio-pca953x.c +3 −3
  76. drivers/gpio/gpio-pch.c +4 −4
  77. drivers/gpio/gpio-pxa.c +3 −3
  78. drivers/gpio/gpio-rc5t583.c +3 −3
  79. drivers/gpio/gpio-rdc321x.c +3 −3
  80. drivers/gpio/gpio-sch.c +3 −3
  81. drivers/gpio/gpio-sodaville.c +2 −2
  82. drivers/gpio/gpio-sta2x11.c +2 −2
  83. drivers/gpio/gpio-stmpe.c +4 −4
  84. drivers/gpio/gpio-stp-xway.c +1 −1
  85. drivers/gpio/gpio-sx150x.c +3 −3
  86. drivers/gpio/gpio-tc3589x.c +3 −3
  87. drivers/gpio/gpio-tegra.c +2 −2
  88. drivers/gpio/gpio-timberdale.c +2 −2
  89. drivers/gpio/gpio-tps6586x.c +3 −3
  90. drivers/gpio/gpio-tps65910.c +3 −3
  91. drivers/gpio/gpio-tps65912.c +3 −3
  92. drivers/gpio/gpio-twl4030.c +4 −4
  93. drivers/gpio/gpio-twl6040.c +2 −2
  94. drivers/gpio/gpio-vr41xx.c +3 −3
  95. drivers/gpio/gpio-vt8500.c +1 −1
  96. drivers/gpio/gpio-vx855.c +3 −3
  97. drivers/gpio/gpio-wm831x.c +3 −3
  98. drivers/gpio/gpio-wm8350.c +3 −3
  99. drivers/gpio/gpio-wm8994.c +3 −3
  100. drivers/gpio/gpio-xilinx.c +2 −2
  101. drivers/hwmon/abituguru.c +6 −6
  102. drivers/hwmon/abituguru3.c +3 −3
  103. drivers/hwmon/ad7314.c +3 −3
  104. drivers/hwmon/ad7414.c +2 −2
  105. drivers/hwmon/adcxx.c +3 −3
  106. drivers/hwmon/ads7871.c +3 −3
  107. drivers/hwmon/adt7411.c +3 −3
  108. drivers/hwmon/coretemp.c +4 −4
  109. drivers/hwmon/da9052-hwmon.c +3 −3
  110. drivers/hwmon/dme1737.c +3 −3
  111. drivers/hwmon/f71805f.c +4 −4
  112. drivers/hwmon/f71882fg.c +4 −4
  113. drivers/hwmon/fam15h_power.c +5 −5
  114. drivers/hwmon/gpio-fan.c +4 −4
  115. drivers/hwmon/hih6130.c +3 −3
  116. drivers/hwmon/i5k_amb.c +9 −9
  117. drivers/hwmon/it87.c +6 −6
  118. drivers/hwmon/jz4740-hwmon.c +3 −3
  119. drivers/hwmon/k10temp.c +4 −4
  120. drivers/hwmon/k8temp.c +4 −4
  121. drivers/hwmon/lm70.c +3 −3
  122. drivers/hwmon/lm78.c +3 −3
  123. drivers/hwmon/max1111.c +4 −4
  124. drivers/hwmon/max197.c +3 −3
  125. drivers/hwmon/mc13783-adc.c +2 −2
  126. drivers/hwmon/ntc_thermistor.c +3 −3
  127. drivers/hwmon/pc87360.c +4 −4
  128. drivers/hwmon/pc87427.c +5 −5
  129. drivers/hwmon/s3c-hwmon.c +3 −3
  130. drivers/hwmon/sch5627.c +2 −2
  131. drivers/hwmon/sch5636.c +1 −1
  132. drivers/hwmon/sht15.c +3 −3
  133. drivers/hwmon/sht21.c +3 −3
  134. drivers/hwmon/sis5595.c +8 −8
  135. drivers/hwmon/smsc47b397.c +3 −3
  136. drivers/hwmon/tmp102.c +3 −3
  137. drivers/hwmon/twl4030-madc-hwmon.c +2 −2
  138. drivers/hwmon/ultra45_env.c +3 −3
  139. drivers/hwmon/via-cputemp.c +3 −3
  140. drivers/hwmon/via686a.c +7 −7
  141. drivers/hwmon/vt1211.c +4 −4
  142. drivers/hwmon/vt8231.c +6 −6
  143. drivers/hwmon/w83627ehf.c +6 −6
  144. drivers/hwmon/w83627hf.c +7 −7
  145. drivers/hwmon/w83781d.c +3 −3
  146. drivers/hwmon/wm831x-hwmon.c +3 −3
  147. drivers/hwmon/wm8350-hwmon.c +3 −3
  148. drivers/hwspinlock/omap_hwspinlock.c +3 −3
  149. drivers/hwspinlock/u8500_hsem.c +3 −3
  150. drivers/leds/leds-adp5520.c +4 −4
  151. drivers/leds/leds-asic3.c +3 −3
  152. drivers/leds/leds-atmel-pwm.c +1 −1
  153. drivers/leds/leds-bd2802.c +1 −1
  154. drivers/leds/leds-blinkm.c +3 −3
  155. drivers/leds/leds-clevo-mail.c +1 −1
  156. drivers/leds/leds-cobalt-qube.c +3 −3
  157. drivers/leds/leds-cobalt-raq.c +3 −3
  158. drivers/leds/leds-da903x.c +3 −3
  159. drivers/leds/leds-da9052.c +3 −3
  160. drivers/leds/leds-gpio.c +6 −6
  161. drivers/leds/leds-lm3530.c +3 −3
  162. drivers/leds/leds-lm3533.c +4 −4
  163. drivers/leds/leds-lm355x.c +4 −4
  164. drivers/leds/leds-lm3642.c +4 −4
  165. drivers/leds/leds-lp3944.c +3 −3
  166. drivers/leds/leds-lp5521.c +4 −4
  167. drivers/leds/leds-lp5523.c +2 −2
  168. drivers/leds/leds-lp8788.c +3 −3
  169. drivers/leds/leds-lt3593.c +4 −4
  170. drivers/leds/leds-max8997.c +3 −3
  171. drivers/leds/leds-mc13783.c +5 −5
  172. drivers/leds/leds-netxbig.c +5 −5
  173. drivers/leds/leds-ns2.c +4 −4
  174. drivers/leds/leds-ot200.c +3 −3
  175. drivers/leds/leds-pca955x.c +3 −3
  176. drivers/leds/leds-pca9633.c +3 −3
  177. drivers/leds/leds-pwm.c +2 −2
  178. drivers/leds/leds-rb532.c +3 −3
  179. drivers/leds/leds-regulator.c +3 −3
  180. drivers/leds/leds-renesas-tpu.c +3 −3
  181. drivers/leds/leds-ss4200.c +2 −2
  182. drivers/leds/leds-sunfire.c +6 −6
  183. drivers/leds/leds-tca6507.c +3 −3
  184. drivers/mfd/88pm800.c +6 −6
  185. drivers/mfd/88pm805.c +5 −5
  186. drivers/mfd/88pm80x.c +1 −1
  187. drivers/mfd/88pm860x-core.c +52 −52
  188. drivers/mfd/ab3100-core.c +6 −7
  189. drivers/mfd/ab8500-core.c +20 −20
  190. drivers/mfd/ab8500-debugfs.c +3 −3
  191. drivers/mfd/ab8500-gpadc.c +3 −3
  192. drivers/mfd/ab8500-sysctrl.c +3 −3
  193. drivers/mfd/adp5520.c +3 −3
  194. drivers/mfd/arizona-core.c +2 −2
  195. drivers/mfd/arizona-i2c.c +3 −3
  196. drivers/mfd/arizona-spi.c +3 −3
  197. drivers/mfd/asic3.c +2 −2
  198. drivers/mfd/cs5535-mfd.c +6 −6
  199. drivers/mfd/da903x.c +5 −5
  200. drivers/mfd/da9052-core.c +2 −2
  201. drivers/mfd/da9052-i2c.c +3 −3
  202. drivers/mfd/da9052-spi.c +3 −3
  203. drivers/mfd/da9055-core.c +2 −2
  204. drivers/mfd/da9055-i2c.c +3 −3
  205. drivers/mfd/davinci_voicecodec.c +2 −2
  206. drivers/mfd/db8500-prcmu.c +1 −1
  207. drivers/mfd/ezx-pcap.c +4 −4
  208. drivers/mfd/htc-i2cpld.c +6 −6
  209. drivers/mfd/intel_msic.c +5 −5
  210. drivers/mfd/janz-cmodio.c +5 −5
  211. drivers/mfd/jz4740-adc.c +3 −3
  212. drivers/mfd/lm3533-core.c +9 −9
  213. drivers/mfd/lp8788.c +2 −2
  214. drivers/mfd/lpc_ich.c +10 −10
  215. drivers/mfd/lpc_sch.c +3 −3
  216. drivers/mfd/max77686.c +1 −1
  217. drivers/mfd/max8907.c +2 −2
  218. drivers/mfd/max8925-core.c +29 −29
  219. drivers/mfd/max8925-i2c.c +3 −3
  220. drivers/mfd/mc13xxx-i2c.c +2 −2
  221. drivers/mfd/mc13xxx-spi.c +2 −2
  222. drivers/mfd/omap-usb-host.c +2 −2
  223. drivers/mfd/omap-usb-tll.c +3 −3
  224. drivers/mfd/palmas.c +3 −3
  225. drivers/mfd/pcf50633-adc.c +3 −3
  226. drivers/mfd/pcf50633-core.c +3 −3
  227. drivers/mfd/pm8921-core.c +4 −4
  228. drivers/mfd/pm8xxx-irq.c +2 −2
  229. drivers/mfd/rc5t583.c +3 −3
  230. drivers/mfd/rdc321x-southbridge.c +3 −3
  231. drivers/mfd/sm501.c +8 −8
  232. drivers/mfd/sta2x11-mfd.c +10 −10
  233. drivers/mfd/stmpe-i2c.c +3 −3
  234. drivers/mfd/stmpe-spi.c +3 −3
  235. drivers/mfd/syscon.c +3 −3
  236. drivers/mfd/tc3589x.c +4 −4
  237. drivers/mfd/tc6387xb.c +3 −3
  238. drivers/mfd/tc6393xb.c +6 −6
  239. drivers/mfd/ti-ssp.c +3 −3
  240. drivers/mfd/timberdale.c +32 −32
  241. drivers/mfd/tps6105x.c +4 −4
  242. drivers/mfd/tps65090.c +4 −4
  243. drivers/mfd/tps65217.c +3 −3
  244. drivers/mfd/tps6586x.c +5 −5
  245. drivers/mfd/tps65910.c +5 −5
  246. drivers/mfd/tps65911-comparator.c +3 −3
  247. drivers/mfd/tps65912-spi.c +3 −3
  248. drivers/mfd/twl-core.c +1 −1
  249. drivers/mfd/twl4030-audio.c +3 −3
  250. drivers/mfd/twl4030-madc.c +2 −2
  251. drivers/mfd/twl4030-power.c +10 −10
  252. drivers/mfd/vx855.c +3 −3
  253. drivers/mfd/wl1273-core.c +2 −2
  254. drivers/mfd/wm831x-spi.c +3 −3
  255. drivers/mfd/wm8994-core.c +8 −8
  256. drivers/mmc/host/atmel-mci.c +1 −1
  257. drivers/mmc/host/au1xmmc.c +2 −2
  258. drivers/mmc/host/bfin_sdh.c +3 −3
  259. drivers/mmc/host/cb710-mmc.c +3 −3
  260. drivers/mmc/host/dw_mmc-pci.c +2 −2
  261. drivers/mmc/host/dw_mmc-pltfm.c +2 −2
  262. drivers/mmc/host/dw_mmc-pltfm.h +1 −1
  263. drivers/mmc/host/jz4740_mmc.c +6 −6
  264. drivers/mmc/host/mmc_spi.c +3 −3
  265. drivers/mmc/host/mmci.c +5 −5
  266. drivers/mmc/host/omap.c +4 −4
  267. drivers/mmc/host/omap_hsmmc.c +3 −3
  268. drivers/mmc/host/pxamci.c +2 −2
  269. drivers/mmc/host/s3cmci.c +3 −3
  270. drivers/mmc/host/sdhci-cns3xxx.c +3 −3
  271. drivers/mmc/host/sdhci-dove.c +4 −4
  272. drivers/mmc/host/sdhci-esdhc-imx.c +4 −4
  273. drivers/mmc/host/sdhci-of-esdhc.c +3 −3
  274. drivers/mmc/host/sdhci-of-hlwd.c +3 −3
  275. drivers/mmc/host/sdhci-pci.c +7 −7
  276. drivers/mmc/host/sdhci-pxav2.c +3 −3
  277. drivers/mmc/host/sdhci-pxav3.c +3 −3
  278. drivers/mmc/host/sdhci-s3c.c +5 −5
  279. drivers/mmc/host/sdhci-spear.c +5 −7
  280. drivers/mmc/host/sdhci-tegra.c +5 −5
  281. drivers/mmc/host/sh_mmcif.c +2 −2
  282. drivers/mmc/host/sh_mobile_sdhi.c +2 −2
  283. drivers/mmc/host/tmio_mmc.c +3 −3
  284. drivers/mmc/host/tmio_mmc_pio.c +1 −1
  285. drivers/mmc/host/via-sdmmc.c +3 −3
  286. drivers/mmc/host/wbsd.c +14 −14
  287. drivers/pci/Makefile +1 −6
  288. drivers/pci/hotplug.c +0 −37
  289. drivers/pci/hotplug/cpcihp_zt5550.c +2 −2
  290. drivers/pci/ioapic.c +3 −3
  291. drivers/pci/pci-driver.c +30 −12
  292. drivers/pci/pci-sysfs.c +0 −7
  293. drivers/pci/pci.c +2 −2
  294. drivers/pci/pci.h +0 −5
  295. drivers/pci/pcie/aer/aerdrv.c +2 −2
  296. drivers/pci/pcie/portdrv_pci.c +1 −1
  297. drivers/pci/probe.c +9 −11
  298. drivers/pci/quirks.c +66 −66
  299. drivers/pci/xen-pcifront.c +5 −5
  300. drivers/pcmcia/bcm63xx_pcmcia.c +6 −6
  301. drivers/pcmcia/bfin_cf_pcmcia.c +3 −3
  302. drivers/pcmcia/db1xxx_ss.c +3 −3
  303. drivers/pcmcia/ds.c +1 −12
  304. drivers/pcmcia/electra_cf.c +2 −2
  305. drivers/pcmcia/i82092.c +3 −3
  306. drivers/pcmcia/pd6729.c +4 −4
  307. drivers/pcmcia/pxa2xx_sharpsl.c +1 −1
  308. drivers/pcmcia/rsrc_nonstatic.c +3 −3
  309. drivers/pcmcia/sa1100_assabet.c +1 −1
  310. drivers/pcmcia/sa1100_cerf.c +1 −1
  311. drivers/pcmcia/sa1100_generic.c +2 −2
  312. drivers/pcmcia/sa1100_h3600.c +1 −1
  313. drivers/pcmcia/sa1100_shannon.c +1 −1
  314. drivers/pcmcia/sa1100_simpad.c +1 −1
  315. drivers/pcmcia/sa1111_generic.c +2 −2
  316. drivers/pcmcia/sa1111_jornada720.c +1 −1
  317. drivers/pcmcia/vrc4171_card.c +4 −4
  318. drivers/pcmcia/vrc4173_cardu.c +4 −4
  319. drivers/pcmcia/xxs1500_ss.c +3 −3
  320. drivers/pcmcia/yenta_socket.c +3 −3
  321. drivers/pinctrl/pinctrl-bcm2835.c +4 −4
  322. drivers/pinctrl/pinctrl-imx.c +1 −1
  323. drivers/pinctrl/pinctrl-imx23.c +2 −2
  324. drivers/pinctrl/pinctrl-imx28.c +2 −2
  325. drivers/pinctrl/pinctrl-imx35.c +2 −2
  326. drivers/pinctrl/pinctrl-imx51.c +2 −2
  327. drivers/pinctrl/pinctrl-imx53.c +2 −2
  328. drivers/pinctrl/pinctrl-imx6q.c +2 −2
  329. drivers/pinctrl/pinctrl-mmp2.c +2 −2
  330. drivers/pinctrl/pinctrl-mxs.c +1 −1
  331. drivers/pinctrl/pinctrl-pxa168.c +2 −2
  332. drivers/pinctrl/pinctrl-pxa910.c +2 −2
  333. drivers/pinctrl/pinctrl-single.c +3 −3
  334. drivers/pinctrl/pinctrl-sirf.c +1 −1
  335. drivers/pinctrl/pinctrl-tegra.c +1 −1
  336. drivers/pinctrl/pinctrl-tegra20.c +2 −2
  337. drivers/pinctrl/pinctrl-tegra30.c +2 −2
  338. drivers/pinctrl/pinctrl-u300.c +2 −2
  339. drivers/pinctrl/spear/pinctrl-spear.c +1 −1
  340. drivers/pinctrl/spear/pinctrl-spear.h +1 −1
  341. drivers/pinctrl/spear/pinctrl-spear1310.c +3 −3
  342. drivers/pinctrl/spear/pinctrl-spear1340.c +3 −3
  343. drivers/pinctrl/spear/pinctrl-spear300.c +3 −3
  344. drivers/pinctrl/spear/pinctrl-spear310.c +3 −3
  345. drivers/pinctrl/spear/pinctrl-spear320.c +3 −3
  346. drivers/pnp/pnpbios/core.c +7 −13
  347. drivers/power/88pm860x_battery.c +3 −3
  348. drivers/power/88pm860x_charger.c +3 −3
  349. drivers/power/ab8500_btemp.c +3 −3
  350. drivers/power/ab8500_charger.c +3 −3
  351. drivers/power/ab8500_fg.c +3 −3
  352. drivers/power/abx500_chargalg.c +3 −3
  353. drivers/power/avs/smartreflex.c +4 −4
  354. drivers/power/bq27x00_battery.c +3 −3
  355. drivers/power/charger-manager.c +2 −2
  356. drivers/power/collie_battery.c +3 −3
  357. drivers/power/da9052-battery.c +3 −3
  358. drivers/power/ds2780_battery.c +3 −3
  359. drivers/power/ds2781_battery.c +3 −3
  360. drivers/power/generic-adc-battery.c +3 −3
  361. drivers/power/gpio-charger.c +3 −3
  362. drivers/power/intel_mid_battery.c +4 −4
  363. drivers/power/isp1704_charger.c +3 −3
  364. drivers/power/jz4740-battery.c +3 −3
  365. drivers/power/lp8727_charger.c +2 −2
  366. drivers/power/lp8788-charger.c +3 −3
  367. drivers/power/max17040_battery.c +3 −3
  368. drivers/power/max17042_battery.c +3 −3
  369. drivers/power/max8903_charger.c +3 −3
  370. drivers/power/max8925_power.c +5 −5
  371. drivers/power/max8997_charger.c +3 −3
  372. drivers/power/max8998_charger.c +3 −3
  373. drivers/power/olpc_battery.c +3 −3
  374. drivers/power/pcf50633-charger.c +3 −3
  375. drivers/power/s3c_adc_battery.c +1 −1
  376. drivers/power/sbs-battery.c +3 −3
  377. drivers/power/smb347-charger.c +1 −1
  378. drivers/power/tosa_battery.c +3 −3
  379. drivers/power/wm831x_backup.c +3 −3
  380. drivers/power/wm831x_power.c +3 −3
  381. drivers/power/wm8350_power.c +3 −3
  382. drivers/power/wm97xx_battery.c +3 −3
  383. drivers/power/z2_battery.c +3 −3
  384. drivers/ptp/ptp_pch.c +2 −2
  385. drivers/pwm/pwm-ab8500.c +3 −3
  386. drivers/pwm/pwm-bfin.c +2 −2
  387. drivers/pwm/pwm-imx.c +3 −3
  388. drivers/pwm/pwm-jz4740.c +3 −3
  389. drivers/pwm/pwm-lpc32xx.c +2 −2
  390. drivers/pwm/pwm-mxs.c +2 −2
  391. drivers/pwm/pwm-puv3.c +3 −3
  392. drivers/pwm/pwm-pxa.c +3 −3
  393. drivers/pwm/pwm-samsung.c +2 −2
  394. drivers/pwm/pwm-tegra.c +2 −2
  395. drivers/pwm/pwm-tiecap.c +3 −3
  396. drivers/pwm/pwm-tiehrpwm.c +3 −3
  397. drivers/pwm/pwm-twl6030.c +1 −1
  398. drivers/rapidio/devices/tsi721.c +2 −2
  399. drivers/rapidio/devices/tsi721.h +1 −1
  400. drivers/rapidio/devices/tsi721_dma.c +1 −1
  401. drivers/rapidio/rio-scan.c +7 −7
  402. drivers/rapidio/rio.c +3 −3
  403. drivers/video/backlight/adp5520_bl.c +3 −3
  404. drivers/video/backlight/adp8860_bl.c +7 −7
  405. drivers/video/backlight/adp8870_bl.c +7 −7
  406. drivers/video/backlight/ams369fg06.c +3 −3
  407. drivers/video/backlight/apple_bl.c +2 −2
  408. drivers/video/backlight/corgi_lcd.c +3 −3
  409. drivers/video/backlight/ep93xx_bl.c +1 −1
  410. drivers/video/backlight/hp680_bl.c +1 −1
  411. drivers/video/backlight/ili9320.c +2 −2
  412. drivers/video/backlight/l4f00242t03.c +3 −3
  413. drivers/video/backlight/ld9040.c +2 −2
  414. drivers/video/backlight/lm3533_bl.c +4 −4
  415. drivers/video/backlight/lm3630_bl.c +4 −4
  416. drivers/video/backlight/lm3639_bl.c +4 −4
  417. drivers/video/backlight/lms283gf05.c +3 −3
  418. drivers/video/backlight/lp855x_bl.c +2 −2
  419. drivers/video/backlight/ltv350qv.c +3 −3
  420. drivers/video/backlight/max8925_bl.c +3 −3
  421. drivers/video/backlight/pcf50633-backlight.c +3 −3
  422. drivers/video/backlight/platform_lcd.c +3 −3
  423. drivers/video/backlight/s6e63m0.c +3 −3
  424. drivers/video/backlight/tdo24m.c +3 −3
  425. drivers/video/backlight/tosa_bl.c +3 −3
  426. drivers/video/backlight/tosa_lcd.c +3 −3
  427. drivers/video/backlight/vgg2432a4.c +3 −3
  428. drivers/watchdog/acquirewdt.c +3 −3
  429. drivers/watchdog/advantechwdt.c +3 −3
  430. drivers/watchdog/ar7_wdt.c +3 −3
  431. drivers/watchdog/at91rm9200_wdt.c +3 −3
  432. drivers/watchdog/ath79_wdt.c +3 −3
  433. drivers/watchdog/bcm63xx_wdt.c +3 −3
  434. drivers/watchdog/bfin_wdt.c +3 −3
  435. drivers/watchdog/cpu5wdt.c +4 −4
  436. drivers/watchdog/cpwd.c +3 −3
  437. drivers/watchdog/da9052_wdt.c +3 −3
  438. drivers/watchdog/davinci_wdt.c +3 −3
  439. drivers/watchdog/dw_wdt.c +3 −3
  440. drivers/watchdog/ep93xx_wdt.c +3 −3
  441. drivers/watchdog/gef_wdt.c +2 −2
  442. drivers/watchdog/geodewdt.c +3 −3
  443. drivers/watchdog/hpwdt.c +15 −15
  444. drivers/watchdog/i6300esb.c +5 −5
  445. drivers/watchdog/iTCO_wdt.c +4 −4
  446. drivers/watchdog/ib700wdt.c +3 −3
  447. drivers/watchdog/ie6xx_wdt.c +5 −5
  448. drivers/watchdog/jz4740_wdt.c +3 −3
  449. drivers/watchdog/ks8695_wdt.c +3 −3
  450. drivers/watchdog/lantiq_wdt.c +3 −3
  451. drivers/watchdog/max63xx_wdt.c +3 −3
  452. drivers/watchdog/mixcomwd.c +1 −1
  453. drivers/watchdog/mpc8xxx_wdt.c +3 −3
  454. drivers/watchdog/mpcore_wdt.c +3 −3
  455. drivers/watchdog/mtx-1_wdt.c +3 −3
  456. drivers/watchdog/mv64x60_wdt.c +3 −3
  457. drivers/watchdog/nuc900_wdt.c +3 −3
  458. drivers/watchdog/nv_tco.c +5 −5
  459. drivers/watchdog/of_xilinx_wdt.c +4 −4
  460. drivers/watchdog/omap_wdt.c +3 −3
  461. drivers/watchdog/orion_wdt.c +4 −4
  462. drivers/watchdog/pcwd.c +4 −4
  463. drivers/watchdog/pcwd_pci.c +3 −3
  464. drivers/watchdog/pnx4008_wdt.c +3 −3
  465. drivers/watchdog/rc32434_wdt.c +3 −3
  466. drivers/watchdog/rdc321x_wdt.c +3 −3
  467. drivers/watchdog/riowd.c +3 −3
  468. drivers/watchdog/s3c2410_wdt.c +3 −3
  469. drivers/watchdog/sch311x_wdt.c +3 −3
  470. drivers/watchdog/shwdt.c +3 −3
  471. drivers/watchdog/sp5100_tco.c +5 −5
  472. drivers/watchdog/sp805_wdt.c +3 −3
  473. drivers/watchdog/stmp3xxx_wdt.c +3 −3
  474. drivers/watchdog/ts72xx_wdt.c +3 −3
  475. drivers/watchdog/twl4030_wdt.c +3 −3
  476. drivers/watchdog/via_wdt.c +3 −3
  477. drivers/watchdog/wdt_pci.c +3 −3
  478. drivers/watchdog/wm831x_wdt.c +3 −3
  479. drivers/watchdog/wm8350_wdt.c +3 −3
  480. drivers/watchdog/xen_wdt.c +3 −3
  481. fs/debugfs/inode.c +0 −1
  482. fs/sysfs/file.c +2 −2
  483. include/linux/init.h +7 −11
  484. include/linux/kobject.h +0 −18
  485. include/linux/mfd/88pm80x.h +1 −1
  486. include/linux/mfd/abx500/ab8500.h +2 −2
  487. include/linux/mfd/pm8xxx/irq.h +4 −4
  488. include/linux/pci.h +3 −5
  489. kernel/ksysfs.c +1 −4
  490. kernel/sysctl.c +2 −2
  491. lib/Makefile +1 −2
  492. scripts/mod/modpost.c +10 −14
Documentation/firmware_class/README+12−0
@@ -22,12 +22,17 @@ · 21 unmodified lines
22 - calls request_firmware(&fw_entry, $FIRMWARE, device)22 - calls request_firmware(&fw_entry, $FIRMWARE, device)
23 - kernel searchs the fimware image with name $FIRMWARE directly23 - kernel searchs the fimware image with name $FIRMWARE directly
24 in the below search path of root filesystem:24 in the below search path of root filesystem:
25 User customized search path by module parameter 'path'[1]
25 "/lib/firmware/updates/" UTS_RELEASE,26 "/lib/firmware/updates/" UTS_RELEASE,
26 "/lib/firmware/updates",27 "/lib/firmware/updates",
27 "/lib/firmware/" UTS_RELEASE,28 "/lib/firmware/" UTS_RELEASE,
28 "/lib/firmware"29 "/lib/firmware"
29 - If found, goto 7), else goto 2)30 - If found, goto 7), else goto 2)
30 31
32 [1], the 'path' is a string parameter which length should be less
33 than 256, user should pass 'firmware_class.path=$CUSTOMIZED_PATH'
34 if firmware_class is built in kernel(the general situation)
35
31 2), userspace:36 2), userspace:
32 - /sys/class/firmware/xxx/{loading,data} appear.37 - /sys/class/firmware/xxx/{loading,data} appear.
33 - hotplug gets called with a firmware identifier in $FIRMWARE38 - hotplug gets called with a firmware identifier in $FIRMWARE
@@ -114,3 +119,10 @@ · 80 unmodified lines
114 on the setup, so I think that the choice on what firmware to make119 on the setup, so I think that the choice on what firmware to make
115 persistent should be left to userspace.120 persistent should be left to userspace.
116 121
122 about firmware cache:
123 --------------------
124 After firmware cache mechanism is introduced during system sleep,
125 request_firmware can be called safely inside device's suspend and
126 resume callback, and callers need't cache the firmware by
127 themselves any more for dealing with firmware loss during system
128 resume.
Documentation/zh_CN/arm/kernel_user_helpers.txt+284−0
@@ -0,0 +1,284 @@
1Chinese translated version of Documentation/arm/kernel_user_helpers.txt
2
3If you have any comment or update to the content, please contact the
4original document maintainer directly. However, if you have a problem
5communicating in English you can also ask the Chinese maintainer for
6help. Contact the Chinese maintainer if this translation is outdated
7or if there is a problem with the translation.
8
9Maintainer: Nicolas Pitre <nicolas.pitre@linaro.org>
10 Dave Martin <dave.martin@linaro.org>
11Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>
12---------------------------------------------------------------------
13Documentation/arm/kernel_user_helpers.txt 的中文翻译
14
15如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
16交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
17译存在问题，请联系中文版维护者。
18英文版维护者： Nicolas Pitre <nicolas.pitre@linaro.org>
19 Dave Martin <dave.martin@linaro.org>
20中文版维护者： 傅炜 Fu Wei <tekkamanninja@gmail.com>
21中文版翻译者： 傅炜 Fu Wei <tekkamanninja@gmail.com>
22中文版校译者： 宋冬生 Dongsheng Song <dongshneg.song@gmail.com>
23 傅炜 Fu Wei <tekkamanninja@gmail.com>
24
25
26以下为正文
27---------------------------------------------------------------------
28内核提供的用户空间辅助代码
29=========================
30
31在内核内存空间的固定地址处，有一个由内核提供并可从用户空间访问的代码
32段。它用于向用户空间提供因在许多 ARM CPU 中未实现的特性和/或指令而需
33内核提供帮助的某些操作。这些代码直接在用户模式下执行的想法是为了获得
34最佳效率，但那些与内核计数器联系过于紧密的部分，则被留给了用户库实现。
35事实上，此代码甚至可能因不同的 CPU 而异，这取决于其可用的指令集或它
36是否为 SMP 系统。换句话说，内核保留在不作出警告的情况下根据需要更改
37这些代码的权利。只有本文档描述的入口及其结果是保证稳定的。
38
39这与完全成熟的 VDSO 实现不同（但两者并不冲突），尽管如此，VDSO 可阻止
40某些通过常量高效跳转到那些代码段的汇编技巧。且由于那些代码段在返回用户
41代码前仅使用少量的代码周期，则一个 VDSO 间接远程调用将会在这些简单的
42操作上增加一个可测量的开销。
43
44在对那些拥有原生支持的新型处理器进行代码优化时，仅在已为其他操作使用
45了类似的新增指令，而导致二进制结果已与早期 ARM 处理器不兼容的情况下，
46用户空间才应绕过这些辅助代码，并在内联函数中实现这些操作（无论是通过
47编译器在代码中直接放置，还是作为库函数调用实现的一部分）。也就是说，
48如果你编译的代码不会为了其他目的使用新指令，则不要仅为了避免使用这些
49内核辅助代码，导致二进制程序无法在早期处理器上运行。
50
51新的辅助代码可能随着时间的推移而增加，所以新内核中的某些辅助代码在旧
52内核中可能不存在。因此，程序必须在对任何辅助代码调用假设是安全之前，
53检测 __kuser_helper_version 的值（见下文）。理想情况下，这种检测应该
54只在进程启动时执行一次；如果内核版本不支持所需辅助代码，则该进程可尽早
55中止执行。
56
57kuser_helper_version
58--------------------
59
60位置: 0xffff0ffc
61
62参考声明:
63
64 extern int32_t __kuser_helper_version;
65
66定义:
67
68 这个区域包含了当前运行内核实现的辅助代码版本号。用户空间可以通过读
69 取此版本号以确定特定的辅助代码是否存在。
70
71使用范例:
72
73#define __kuser_helper_version (*(int32_t *)0xffff0ffc)
74
75void check_kuser_version(void)
76{
77 if (__kuser_helper_version < 2) {
78 fprintf(stderr, "can't do atomic operations, kernel too old\n");
79 abort();
80 }
81}
82
83注意:
84
85 用户空间可以假设这个域的值不会在任何单个进程的生存期内改变。也就
86 是说，这个域可以仅在库的初始化阶段或进程启动阶段读取一次。
87
88kuser_get_tls
89-------------
90
91位置: 0xffff0fe0
92
93参考原型:
94
95 void * __kuser_get_tls(void);
96
97输入:
98
99 lr = 返回地址
100
101输出:
102
103 r0 = TLS 值
104
105被篡改的寄存器:
106
107 无
108
109定义:
110
111 获取之前通过 __ARM_NR_set_tls 系统调用设置的 TLS 值。
112
113使用范例:
114
115typedef void * (__kuser_get_tls_t)(void);
116#define __kuser_get_tls (*(__kuser_get_tls_t *)0xffff0fe0)
117
118void foo()
119{
120 void *tls = __kuser_get_tls();
121 printf("TLS = %p\n", tls);
122}
123
124注意:
125
126 - 仅在 __kuser_helper_version >= 1 时，此辅助代码存在
127 （从内核版本 2.6.12 开始）。
128
129kuser_cmpxchg
130-------------
131
132位置: 0xffff0fc0
133
134参考原型:
135
136 int __kuser_cmpxchg(int32_t oldval, int32_t newval, volatile int32_t *ptr);
137
138输入:
139
140 r0 = oldval
141 r1 = newval
142 r2 = ptr
143 lr = 返回地址
144
145输出:
146
147 r0 = 成功代码 (零或非零)
148 C flag = 如果 r0 == 0 则置 1，如果 r0 != 0 则清零。
149
150被篡改的寄存器:
151
152 r3, ip, flags
153
154定义:
155
156 仅在 *ptr 为 oldval 时原子保存 newval 于 *ptr 中。
157 如果 *ptr 被改变，则返回值为零，否则为非零值。
158 如果 *ptr 被改变，则 C flag 也会被置 1，以实现调用代码中的汇编
159 优化。
160
161使用范例:
162
163typedef int (__kuser_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
164#define __kuser_cmpxchg (*(__kuser_cmpxchg_t *)0xffff0fc0)
165
166int atomic_add(volatile int *ptr, int val)
167{
168 int old, new;
169
170 do {
171 old = *ptr;
172 new = old + val;
173 } while(__kuser_cmpxchg(old, new, ptr));
174
175 return new;
176}
177
178注意:
179
180 - 这个例程已根据需要包含了内存屏障。
181
182 - 仅在 __kuser_helper_version >= 2 时，此辅助代码存在
183 （从内核版本 2.6.12 开始）。
184
185kuser_memory_barrier
186--------------------
187
188位置: 0xffff0fa0
189
190参考原型:
191
192 void __kuser_memory_barrier(void);
193
194输入:
195
196 lr = 返回地址
197
198输出:
199
200 无
201
202被篡改的寄存器:
203
204 无
205
206定义:
207
208 应用于任何需要内存屏障以防止手动数据修改带来的一致性问题，以及
209 __kuser_cmpxchg 中。
210
211使用范例:
212
213typedef void (__kuser_dmb_t)(void);
214#define __kuser_dmb (*(__kuser_dmb_t *)0xffff0fa0)
215
216注意:
217
218 - 仅在 __kuser_helper_version >= 3 时，此辅助代码存在
219 （从内核版本 2.6.15 开始）。
220
221kuser_cmpxchg64
222---------------
223
224位置: 0xffff0f60
225
226参考原型:
227
228 int __kuser_cmpxchg64(const int64_t *oldval,
229 const int64_t *newval,
230 volatile int64_t *ptr);
231
232输入:
233
234 r0 = 指向 oldval
235 r1 = 指向 newval
236 r2 = 指向目标值
237 lr = 返回地址
238
239输出:
240
241 r0 = 成功代码 (零或非零)
242 C flag = 如果 r0 == 0 则置 1，如果 r0 != 0 则清零。
243
244被篡改的寄存器:
245
246 r3, lr, flags
247
248定义:
249
250 仅在 *ptr 等于 *oldval 指向的 64 位值时，原子保存 *newval
251 指向的 64 位值于 *ptr 中。如果 *ptr 被改变，则返回值为零，
252 否则为非零值。
253
254 如果 *ptr 被改变，则 C flag 也会被置 1，以实现调用代码中的汇编
255 优化。
256
257使用范例:
258
259typedef int (__kuser_cmpxchg64_t)(const int64_t *oldval,
260 const int64_t *newval,
261 volatile int64_t *ptr);
262#define __kuser_cmpxchg64 (*(__kuser_cmpxchg64_t *)0xffff0f60)
263
264int64_t atomic_add64(volatile int64_t *ptr, int64_t val)
265{
266 int64_t old, new;
267
268 do {
269 old = *ptr;
270 new = old + val;
271 } while(__kuser_cmpxchg64(&old, &new, ptr));
272
273 return new;
274}
275
276注意:
277
278 - 这个例程已根据需要包含了内存屏障。
279
280 - 由于这个过程的代码长度（此辅助代码跨越 2 个常规的 kuser “槽”），
281 因此 0xffff0f80 不被作为有效的入口点。
282
283 - 仅在 __kuser_helper_version >= 5 时，此辅助代码存在
284 （从内核版本 3.1 开始）。
Documentation/zh_CN/arm64/memory.txt+7−7
@@ -47,21 +47,21 @@ AArch64 Linux 内存布局： · 46 unmodified lines
47-----------------------------------------------------------------------47-----------------------------------------------------------------------
480000000000000000 0000007fffffffff 512GB 用户空间480000000000000000 0000007fffffffff 512GB 用户空间
49 49
50ffffff8000000000 ffffffbbfffcffff ~240GB vmalloc50ffffff8000000000 ffffffbbfffeffff ~240GB vmalloc
51 51
52ffffffbbfffd0000 ffffffbcfffdffff 64KB [防护页]52ffffffbbffff0000 ffffffbbffffffff 64KB [防护页]
53 53
54ffffffbbfffe0000 ffffffbcfffeffff 64KB PCI I/O 空间54ffffffbc00000000 ffffffbdffffffff 8GB vmemmap
55 55
56ffffffbbffff0000 ffffffbcffffffff 64KB [防护页]56ffffffbe00000000 ffffffbffbbfffff ~8GB [防护页，未来用于 vmmemap]
57 57
58ffffffbc00000000 ffffffbdffffffff 8GB vmemmap58ffffffbffbe00000 ffffffbffbe0ffff 64KB PCI I/O 空间
59 59
60ffffffbe00000000 ffffffbffbffffff ~8GB [防护页，未来用于 vmmemap]60ffffffbbffff0000 ffffffbcffffffff ~2MB [防护页]
61 61
62ffffffbffc000000 ffffffbfffffffff 64MB 模块62ffffffbffc000000 ffffffbfffffffff 64MB 模块
63 63
64ffffffc000000000 ffffffffffffffff 256GB 内存空间64ffffffc000000000 ffffffffffffffff 256GB 内核逻辑内存映射
65 65
66 66
674KB 页大小的转换表查找：674KB 页大小的转换表查找：
arch/microblaze/pci/pci-common.c+0−4
@@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void) · 1345 unmodified lines
1346 pci_assign_unassigned_resources();1346 pci_assign_unassigned_resources();
1347}1347}
1348 1348
1349#ifdef CONFIG_HOTPLUG
1350
1351/* This is used by the PCI hotplug driver to allocate resource1349/* This is used by the PCI hotplug driver to allocate resource
1352 * of newly plugged busses. We can try to consolidate with the1350 * of newly plugged busses. We can try to consolidate with the
1353 * rest of the code later, for now, keep it as-is as our main1351 * rest of the code later, for now, keep it as-is as our main
@@ -1407,8 +1405,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) · 53 unmodified lines
1407}1405}
1408EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);1406EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
1409 1407
1410#endif /* CONFIG_HOTPLUG */
1411
1412int pcibios_enable_device(struct pci_dev *dev, int mask)1408int pcibios_enable_device(struct pci_dev *dev, int mask)
1413{1409{
1414 return pci_enable_resources(dev, mask);1410 return pci_enable_resources(dev, mask);
arch/mips/pci/pci.c+0−2
@@ -313,10 +313,8 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) · 312 unmodified lines
313 }313 }
314}314}
315 315
316#ifdef CONFIG_HOTPLUG
317EXPORT_SYMBOL(PCIBIOS_MIN_IO);316EXPORT_SYMBOL(PCIBIOS_MIN_IO);
318EXPORT_SYMBOL(PCIBIOS_MIN_MEM);317EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
319#endif
320 318
321int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,319int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
322 enum pci_mmap_state mmap_state, int write_combine)320 enum pci_mmap_state mmap_state, int write_combine)
arch/powerpc/kernel/pci-common.c+0−4
@@ -1428,8 +1428,6 @@ void __init pcibios_resource_survey(void) · 1427 unmodified lines
1428 ppc_md.pcibios_fixup();1428 ppc_md.pcibios_fixup();
1429}1429}
1430 1430
1431#ifdef CONFIG_HOTPLUG
1432
1433/* This is used by the PCI hotplug driver to allocate resource1431/* This is used by the PCI hotplug driver to allocate resource
1434 * of newly plugged busses. We can try to consolidate with the1432 * of newly plugged busses. We can try to consolidate with the
1435 * rest of the code later, for now, keep it as-is as our main1433 * rest of the code later, for now, keep it as-is as our main
@@ -1488,8 +1486,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) · 52 unmodified lines
1488}1486}
1489EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);1487EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
1490 1488
1491#endif /* CONFIG_HOTPLUG */
1492
1493int pcibios_enable_device(struct pci_dev *dev, int mask)1489int pcibios_enable_device(struct pci_dev *dev, int mask)
1494{1490{
1495 if (ppc_md.pcibios_enable_device_hook)1491 if (ppc_md.pcibios_enable_device_hook)
arch/powerpc/kernel/pci_64.c+0−4
@@ -74,8 +74,6 @@ static int __init pcibios_init(void) · 73 unmodified lines
74 74
75subsys_initcall(pcibios_init);75subsys_initcall(pcibios_init);
76 76
77#ifdef CONFIG_HOTPLUG
78
79int pcibios_unmap_io_space(struct pci_bus *bus)77int pcibios_unmap_io_space(struct pci_bus *bus)
80{78{
81 struct pci_controller *hose;79 struct pci_controller *hose;
@@ -124,8 +122,6 @@ int pcibios_unmap_io_space(struct pci_bus *bus) · 42 unmodified lines
124}122}
125EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);123EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);
126 124
127#endif /* CONFIG_HOTPLUG */
128
129static int __devinit pcibios_map_phb_io_space(struct pci_controller *hose)125static int __devinit pcibios_map_phb_io_space(struct pci_controller *hose)
130{126{
131 struct vm_struct *area;127 struct vm_struct *area;
arch/sh/drivers/pci/pci.c+0−2
@@ -319,7 +319,5 @@ EXPORT_SYMBOL(pci_iounmap); · 318 unmodified lines
319 319
320#endif /* CONFIG_GENERIC_IOMAP */320#endif /* CONFIG_GENERIC_IOMAP */
321 321
322#ifdef CONFIG_HOTPLUG
323EXPORT_SYMBOL(PCIBIOS_MIN_IO);322EXPORT_SYMBOL(PCIBIOS_MIN_IO);
324EXPORT_SYMBOL(PCIBIOS_MIN_MEM);323EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
325#endif
arch/unicore32/kernel/pci.c+0−2
@@ -250,9 +250,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) · 249 unmodified lines
250 printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",250 printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
251 bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");251 bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
252}252}
253#ifdef CONFIG_HOTPLUG
254EXPORT_SYMBOL(pcibios_fixup_bus);253EXPORT_SYMBOL(pcibios_fixup_bus);
255#endif
256 254
257static int __init pci_common_init(void)255static int __init pci_common_init(void)
258{256{
drivers/acpi/apei/ghes.c+1−1
@@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size( · 900 unmodified lines
901 return prealloc_size;901 return prealloc_size;
902}902}
903 903
904static int __devinit ghes_probe(struct platform_device *ghes_dev)904static int ghes_probe(struct platform_device *ghes_dev)
905{905{
906 struct acpi_hest_generic *generic;906 struct acpi_hest_generic *generic;
907 struct ghes *ghes = NULL;907 struct ghes *ghes = NULL;
drivers/acpi/hed.c+1−1
@@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event) · 60 unmodified lines
61 blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);61 blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);
62}62}
63 63
64static int __devinit acpi_hed_add(struct acpi_device *device)64static int acpi_hed_add(struct acpi_device *device)
65{65{
66 /* Only one hardware error device */66 /* Only one hardware error device */
67 if (hed_handle)67 if (hed_handle)
drivers/acpi/pci_root.c+1−1
@@ -445,7 +445,7 @@ out: · 444 unmodified lines
445}445}
446EXPORT_SYMBOL(acpi_pci_osc_control_set);446EXPORT_SYMBOL(acpi_pci_osc_control_set);
447 447
448static int __devinit acpi_pci_root_add(struct acpi_device *device)448static int acpi_pci_root_add(struct acpi_device *device)
449{449{
450 unsigned long long segment, bus;450 unsigned long long segment, bus;
451 acpi_status status;451 acpi_status status;
drivers/base/Kconfig+3−4
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT · 56 unmodified lines
57 on the rootfs is completely empty.57 on the rootfs is completely empty.
58 58
59config STANDALONE59config STANDALONE
60 bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL60 bool "Select only drivers that don't need compile-time external firmware"
61 default y61 default y
62 help62 help
63 Select this option if you don't have magic firmware for drivers that63 Select this option if you don't have magic firmware for drivers that
@@ -185,7 +185,6 @@ config DMA_SHARED_BUFFER · 121 unmodified lines
185 bool185 bool
186 default n186 default n
187 select ANON_INODES187 select ANON_INODES
188 depends on EXPERIMENTAL
189 help188 help
190 This option enables the framework for buffer-sharing between189 This option enables the framework for buffer-sharing between
191 multiple drivers. A buffer is associated with a file using driver190 multiple drivers. A buffer is associated with a file using driver
@@ -193,8 +192,8 @@ config DMA_SHARED_BUFFER · 1 unmodified line
193 driver.192 driver.
194 193
195config CMA194config CMA
196 bool "Contiguous Memory Allocator (EXPERIMENTAL)"195 bool "Contiguous Memory Allocator"
197 depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL196 depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
198 select MIGRATION197 select MIGRATION
199 select MEMORY_ISOLATION198 select MEMORY_ISOLATION
200 help199 help
drivers/base/attribute_container.c+1−1
@@ -158,7 +158,7 @@ attribute_container_add_device(struct device *dev, · 157 unmodified lines
158 158
159 ic = kzalloc(sizeof(*ic), GFP_KERNEL);159 ic = kzalloc(sizeof(*ic), GFP_KERNEL);
160 if (!ic) {160 if (!ic) {
161 dev_printk(KERN_ERR, dev, "failed to allocate class container\n");161 dev_err(dev, "failed to allocate class container\n");
162 continue;162 continue;
163 }163 }
164 164
drivers/base/bus.c+0−14
@@ -164,8 +164,6 @@ static const struct kset_uevent_ops bus_uevent_ops = { · 163 unmodified lines
164 164
165static struct kset *bus_kset;165static struct kset *bus_kset;
166 166
167
168#ifdef CONFIG_HOTPLUG
169/* Manually detach a device from its associated driver. */167/* Manually detach a device from its associated driver. */
170static ssize_t driver_unbind(struct device_driver *drv,168static ssize_t driver_unbind(struct device_driver *drv,
171 const char *buf, size_t count)169 const char *buf, size_t count)
@@ -252,7 +250,6 @@ static ssize_t store_drivers_probe(struct bus_type *bus, · 80 unmodified lines
252 return -EINVAL;250 return -EINVAL;
253 return count;251 return count;
254}252}
255#endif
256 253
257static struct device *next_device(struct klist_iter *i)254static struct device *next_device(struct klist_iter *i)
258{255{
@@ -618,11 +615,6 @@ static void driver_remove_attrs(struct bus_type *bus, · 359 unmodified lines
618 }615 }
619}616}
620 617
621#ifdef CONFIG_HOTPLUG
622/*
623 * Thanks to drivers making their tables __devinit, we can't allow manual
624 * bind and unbind from userspace unless CONFIG_HOTPLUG is enabled.
625 */
626static int __must_check add_bind_files(struct device_driver *drv)618static int __must_check add_bind_files(struct device_driver *drv)
627{619{
628 int ret;620 int ret;
@@ -666,12 +658,6 @@ static void remove_probe_files(struct bus_type *bus) · 37 unmodified lines
666 bus_remove_file(bus, &bus_attr_drivers_autoprobe);658 bus_remove_file(bus, &bus_attr_drivers_autoprobe);
667 bus_remove_file(bus, &bus_attr_drivers_probe);659 bus_remove_file(bus, &bus_attr_drivers_probe);
668}660}
669#else
670static inline int add_bind_files(struct device_driver *drv) { return 0; }
671static inline void remove_bind_files(struct device_driver *drv) {}
672static inline int add_probe_files(struct bus_type *bus) { return 0; }
673static inline void remove_probe_files(struct bus_type *bus) {}
674#endif
675 661
676static ssize_t driver_uevent_store(struct device_driver *drv,662static ssize_t driver_uevent_store(struct device_driver *drv,
677 const char *buf, size_t count)663 const char *buf, size_t count)
drivers/base/core.c+5−3
@@ -1399,7 +1399,7 @@ struct root_device { · 1398 unmodified lines
1399 struct module *owner;1399 struct module *owner;
1400};1400};
1401 1401
1402inline struct root_device *to_root_device(struct device *d)1402static inline struct root_device *to_root_device(struct device *d)
1403{1403{
1404 return container_of(d, struct root_device, dev);1404 return container_of(d, struct root_device, dev);
1405}1405}
@@ -1840,10 +1840,12 @@ void device_shutdown(void) · 434 unmodified lines
1840 pm_runtime_barrier(dev);1840 pm_runtime_barrier(dev);
1841 1841
1842 if (dev->bus && dev->bus->shutdown) {1842 if (dev->bus && dev->bus->shutdown) {
1843 dev_dbg(dev, "shutdown\n");1843 if (initcall_debug)
1844 dev_info(dev, "shutdown\n");
1844 dev->bus->shutdown(dev);1845 dev->bus->shutdown(dev);
1845 } else if (dev->driver && dev->driver->shutdown) {1846 } else if (dev->driver && dev->driver->shutdown) {
1846 dev_dbg(dev, "shutdown\n");1847 if (initcall_debug)
1848 dev_info(dev, "shutdown\n");
1847 dev->driver->shutdown(dev);1849 dev->driver->shutdown(dev);
1848 }1850 }
1849 1851
drivers/base/devres.c+2−2
@@ -50,8 +50,8 @@ static void devres_log(struct device *dev, struct devres_node *node, · 49 unmodified lines
50 const char *op)50 const char *op)
51{51{
52 if (unlikely(log_devres))52 if (unlikely(log_devres))
53 dev_printk(KERN_ERR, dev, "DEVRES %3s %p %s (%lu bytes)\n",53 dev_err(dev, "DEVRES %3s %p %s (%lu bytes)\n",
54 op, node, node->name, (unsigned long)node->size);54 op, node, node->name, (unsigned long)node->size);
55}55}
56#else /* CONFIG_DEBUG_DEVRES */56#else /* CONFIG_DEBUG_DEVRES */
57#define set_node_dbginfo(node, n, s) do {} while (0)57#define set_node_dbginfo(node, n, s) do {} while (0)
drivers/base/firmware_class.c+40−12
@@ -143,7 +143,7 @@ struct fw_cache_entry { · 142 unmodified lines
143};143};
144 144
145struct firmware_priv {145struct firmware_priv {
146 struct timer_list timeout;146 struct delayed_work timeout_work;
147 bool nowait;147 bool nowait;
148 struct device dev;148 struct device dev;
149 struct firmware_buf *buf;149 struct firmware_buf *buf;
@@ -246,7 +246,6 @@ static void __fw_free_buf(struct kref *ref) · 96 unmodified lines
246 __func__, buf->fw_id, buf, buf->data,246 __func__, buf->fw_id, buf, buf->data,
247 (unsigned int)buf->size);247 (unsigned int)buf->size);
248 248
249 spin_lock(&fwc->lock);
250 list_del(&buf->list);249 list_del(&buf->list);
251 spin_unlock(&fwc->lock);250 spin_unlock(&fwc->lock);
252 251
@@ -263,19 +262,32 @@ static void __fw_free_buf(struct kref *ref) · 10 unmodified lines
263 262
264static void fw_free_buf(struct firmware_buf *buf)263static void fw_free_buf(struct firmware_buf *buf)
265{264{
266 kref_put(&buf->ref, __fw_free_buf);265 struct firmware_cache *fwc = buf->fwc;
266 spin_lock(&fwc->lock);
267 if (!kref_put(&buf->ref, __fw_free_buf))
268 spin_unlock(&fwc->lock);
267}269}
268 270
269/* direct firmware loading support */271/* direct firmware loading support */
270static const char *fw_path[] = {272static char fw_path_para[256];
273static const char * const fw_path[] = {
274 fw_path_para,
271 "/lib/firmware/updates/" UTS_RELEASE,275 "/lib/firmware/updates/" UTS_RELEASE,
272 "/lib/firmware/updates",276 "/lib/firmware/updates",
273 "/lib/firmware/" UTS_RELEASE,277 "/lib/firmware/" UTS_RELEASE,
274 "/lib/firmware"278 "/lib/firmware"
275};279};
276 280
281/*
282 * Typical usage is that passing 'firmware_class.path=$CUSTOMIZED_PATH'
283 * from kernel command line because firmware_class is generally built in
284 * kernel instead of module.
285 */
286module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644);
287MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path");
288
277/* Don't inline this: 'struct kstat' is biggish */289/* Don't inline this: 'struct kstat' is biggish */
278static noinline long fw_file_size(struct file *file)290static noinline_for_stack long fw_file_size(struct file *file)
279{291{
280 struct kstat st;292 struct kstat st;
281 if (vfs_getattr(file->f_path.mnt, file->f_path.dentry, &st))293 if (vfs_getattr(file->f_path.mnt, file->f_path.dentry, &st))
@@ -315,6 +327,11 @@ static bool fw_get_filesystem_firmware(struct firmware_buf *buf) · 33 unmodified lines
315 327
316 for (i = 0; i < ARRAY_SIZE(fw_path); i++) {328 for (i = 0; i < ARRAY_SIZE(fw_path); i++) {
317 struct file *file;329 struct file *file;
330
331 /* skip the unset customized path */
332 if (!fw_path[i][0])
333 continue;
334
318 snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id);335 snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id);
319 336
320 file = filp_open(path, O_RDONLY, 0);337 file = filp_open(path, O_RDONLY, 0);
@@ -667,11 +684,18 @@ static struct bin_attribute firmware_attr_data = { · 346 unmodified lines
667 .write = firmware_data_write,684 .write = firmware_data_write,
668};685};
669 686
670static void firmware_class_timeout(u_long data)687static void firmware_class_timeout_work(struct work_struct *work)
671{688{
672 struct firmware_priv *fw_priv = (struct firmware_priv *) data;689 struct firmware_priv *fw_priv = container_of(work,
690 struct firmware_priv, timeout_work.work);
673 691
692 mutex_lock(&fw_lock);
693 if (test_bit(FW_STATUS_DONE, &(fw_priv->buf->status))) {
694 mutex_unlock(&fw_lock);
695 return;
696 }
674 fw_load_abort(fw_priv);697 fw_load_abort(fw_priv);
698 mutex_unlock(&fw_lock);
675}699}
676 700
677static struct firmware_priv *701static struct firmware_priv *
@@ -690,8 +714,8 @@ fw_create_instance(struct firmware *firmware, const char *fw_name, · 12 unmodified lines
690 714
691 fw_priv->nowait = nowait;715 fw_priv->nowait = nowait;
692 fw_priv->fw = firmware;716 fw_priv->fw = firmware;
693 setup_timer(&fw_priv->timeout,717 INIT_DELAYED_WORK(&fw_priv->timeout_work,
694 firmware_class_timeout, (u_long) fw_priv);718 firmware_class_timeout_work);
695 719
696 f_dev = &fw_priv->dev;720 f_dev = &fw_priv->dev;
697 721
@@ -858,7 +882,9 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent, · 160 unmodified lines
858 dev_dbg(f_dev->parent, "firmware: direct-loading"882 dev_dbg(f_dev->parent, "firmware: direct-loading"
859 " firmware %s\n", buf->fw_id);883 " firmware %s\n", buf->fw_id);
860 884
885 mutex_lock(&fw_lock);
861 set_bit(FW_STATUS_DONE, &buf->status);886 set_bit(FW_STATUS_DONE, &buf->status);
887 mutex_unlock(&fw_lock);
862 complete_all(&buf->completion);888 complete_all(&buf->completion);
863 direct_load = 1;889 direct_load = 1;
864 goto handle_fw;890 goto handle_fw;
@@ -894,15 +920,14 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent, · 29 unmodified lines
894 dev_set_uevent_suppress(f_dev, false);920 dev_set_uevent_suppress(f_dev, false);
895 dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);921 dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);
896 if (timeout != MAX_SCHEDULE_TIMEOUT)922 if (timeout != MAX_SCHEDULE_TIMEOUT)
897 mod_timer(&fw_priv->timeout,923 schedule_delayed_work(&fw_priv->timeout_work, timeout);
898 round_jiffies_up(jiffies + timeout));
899 924
900 kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);925 kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);
901 }926 }
902 927
903 wait_for_completion(&buf->completion);928 wait_for_completion(&buf->completion);
904 929
905 del_timer_sync(&fw_priv->timeout);930 cancel_delayed_work_sync(&fw_priv->timeout_work);
906 931
907handle_fw:932handle_fw:
908 mutex_lock(&fw_lock);933 mutex_lock(&fw_lock);
@@ -963,6 +988,9 @@ err_put_dev: · 54 unmodified lines
963 * firmware image for this or any other device.988 * firmware image for this or any other device.
964 *989 *
965 * Caller must hold the reference count of @device.990 * Caller must hold the reference count of @device.
991 *
992 * The function can be called safely inside device's suspend and
993 * resume callback.
966 **/994 **/
967int995int
968request_firmware(const struct firmware **firmware_p, const char *name,996request_firmware(const struct firmware **firmware_p, const char *name,
drivers/base/platform.c+2−2
@@ -45,7 +45,7 @@ EXPORT_SYMBOL_GPL(platform_bus); · 44 unmodified lines
45 * be setup before the platform_notifier is called. So if a user needs to45 * be setup before the platform_notifier is called. So if a user needs to
46 * manipulate any relevant information in the pdev_archdata they can do:46 * manipulate any relevant information in the pdev_archdata they can do:
47 *47 *
48 * platform_devic_alloc()48 * platform_device_alloc()
49 * ... manipulate ...49 * ... manipulate ...
50 * platform_device_add()50 * platform_device_add()
51 *51 *
@@ -123,7 +123,7 @@ struct resource *platform_get_resource_byname(struct platform_device *dev, · 71 unmodified lines
123EXPORT_SYMBOL_GPL(platform_get_resource_byname);123EXPORT_SYMBOL_GPL(platform_get_resource_byname);
124 124
125/**125/**
126 * platform_get_irq - get an IRQ for a device126 * platform_get_irq_byname - get an IRQ for a device by name
127 * @dev: platform device127 * @dev: platform device
128 * @name: IRQ name128 * @name: IRQ name
129 */129 */
drivers/char/tpm/tpm_i2c_infineon.c+2−2
@@ -555,7 +555,7 @@ static struct tpm_vendor_specific tpm_tis_i2c = { · 554 unmodified lines
555 .miscdev.fops = &tis_ops,555 .miscdev.fops = &tis_ops,
556};556};
557 557
558static int __devinit tpm_tis_i2c_init(struct device *dev)558static int tpm_tis_i2c_init(struct device *dev)
559{559{
560 u32 vendor;560 u32 vendor;
561 int rc = 0;561 int rc = 0;
@@ -632,7 +632,7 @@ static const struct i2c_device_id tpm_tis_i2c_table[] = { · 70 unmodified lines
632MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table);632MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table);
633static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);633static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);
634 634
635static int __devinit tpm_tis_i2c_probe(struct i2c_client *client,635static int tpm_tis_i2c_probe(struct i2c_client *client,
636 const struct i2c_device_id *id)636 const struct i2c_device_id *id)
637{637{
638 int rc;638 int rc;
drivers/char/tpm/tpm_ibmvtpm.c+1−1
@@ -602,7 +602,7 @@ static void ibmvtpm_tasklet(void *data) · 601 unmodified lines
602 * 0 - Success602 * 0 - Success
603 * Non-zero - Failure603 * Non-zero - Failure
604 */604 */
605static int __devinit tpm_ibmvtpm_probe(struct vio_dev *vio_dev,605static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
606 const struct vio_device_id *id)606 const struct vio_device_id *id)
607{607{
608 struct ibmvtpm_dev *ibmvtpm;608 struct ibmvtpm_dev *ibmvtpm;
drivers/char/tpm/tpm_infineon.c+2−2
@@ -415,7 +415,7 @@ static const struct pnp_device_id tpm_inf_pnp_tbl[] = { · 414 unmodified lines
415 415
416MODULE_DEVICE_TABLE(pnp, tpm_inf_pnp_tbl);416MODULE_DEVICE_TABLE(pnp, tpm_inf_pnp_tbl);
417 417
418static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,418static int tpm_inf_pnp_probe(struct pnp_dev *dev,
419 const struct pnp_device_id *dev_id)419 const struct pnp_device_id *dev_id)
420{420{
421 int rc = 0;421 int rc = 0;
@@ -655,7 +655,7 @@ static struct pnp_driver tpm_inf_pnp_driver = { · 233 unmodified lines
655 .probe = tpm_inf_pnp_probe,655 .probe = tpm_inf_pnp_probe,
656 .suspend = tpm_inf_pnp_suspend,656 .suspend = tpm_inf_pnp_suspend,
657 .resume = tpm_inf_pnp_resume,657 .resume = tpm_inf_pnp_resume,
658 .remove = __devexit_p(tpm_inf_pnp_remove)658 .remove = tpm_inf_pnp_remove
659};659};
660 660
661static int __init init_inf(void)661static int __init init_inf(void)
drivers/char/tpm/tpm_tis.c+1−1
@@ -729,7 +729,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) · 728 unmodified lines
729#endif729#endif
730 730
731#ifdef CONFIG_PNP731#ifdef CONFIG_PNP
732static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,732static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
733 const struct pnp_device_id *pnp_id)733 const struct pnp_device_id *pnp_id)
734{734{
735 resource_size_t start, len;735 resource_size_t start, len;
drivers/clk/clk-max77686.c+3−3
@@ -143,7 +143,7 @@ static int max77686_clk_register(struct device *dev, · 142 unmodified lines
143 return 0;143 return 0;
144}144}
145 145
146static __devinit int max77686_clk_probe(struct platform_device *pdev)146static int max77686_clk_probe(struct platform_device *pdev)
147{147{
148 struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);148 struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
149 struct max77686_clk **max77686_clks;149 struct max77686_clk **max77686_clks;
@@ -199,7 +199,7 @@ out: · 49 unmodified lines
199 return ret;199 return ret;
200}200}
201 201
202static int __devexit max77686_clk_remove(struct platform_device *pdev)202static int max77686_clk_remove(struct platform_device *pdev)
203{203{
204 struct max77686_clk **max77686_clks = platform_get_drvdata(pdev);204 struct max77686_clk **max77686_clks = platform_get_drvdata(pdev);
205 int i;205 int i;
@@ -223,7 +223,7 @@ static struct platform_driver max77686_clk_driver = { · 17 unmodified lines
223 .owner = THIS_MODULE,223 .owner = THIS_MODULE,
224 },224 },
225 .probe = max77686_clk_probe,225 .probe = max77686_clk_probe,
226 .remove = __devexit_p(max77686_clk_remove),226 .remove = max77686_clk_remove,
227 .id_table = max77686_clk_id,227 .id_table = max77686_clk_id,
228};228};
229 229
drivers/clk/clk-wm831x.c+3−3
@@ -350,7 +350,7 @@ static struct clk_init_data wm831x_clkout_init = { · 349 unmodified lines
350 .flags = CLK_SET_RATE_PARENT,350 .flags = CLK_SET_RATE_PARENT,
351};351};
352 352
353static __devinit int wm831x_clk_probe(struct platform_device *pdev)353static int wm831x_clk_probe(struct platform_device *pdev)
354{354{
355 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);355 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
356 struct wm831x_clk *clkdata;356 struct wm831x_clk *clkdata;
@@ -389,14 +389,14 @@ static __devinit int wm831x_clk_probe(struct platform_device *pdev) · 32 unmodified lines
389 return 0;389 return 0;
390}390}
391 391
392static int __devexit wm831x_clk_remove(struct platform_device *pdev)392static int wm831x_clk_remove(struct platform_device *pdev)
393{393{
394 return 0;394 return 0;
395}395}
396 396
397static struct platform_driver wm831x_clk_driver = {397static struct platform_driver wm831x_clk_driver = {
398 .probe = wm831x_clk_probe,398 .probe = wm831x_clk_probe,
399 .remove = __devexit_p(wm831x_clk_remove),399 .remove = wm831x_clk_remove,
400 .driver = {400 .driver = {
401 .name = "wm831x-clk",401 .name = "wm831x-clk",
402 .owner = THIS_MODULE,402 .owner = THIS_MODULE,
drivers/dma/dw_dmac.c+2−2
@@ -1462,7 +1462,7 @@ static void dw_dma_off(struct dw_dma *dw) · 1461 unmodified lines
1462 dw->chan[i].initialized = false;1462 dw->chan[i].initialized = false;
1463}1463}
1464 1464
1465static int __devinit dw_probe(struct platform_device *pdev)1465static int dw_probe(struct platform_device *pdev)
1466{1466{
1467 struct dw_dma_platform_data *pdata;1467 struct dw_dma_platform_data *pdata;
1468 struct resource *io;1468 struct resource *io;
@@ -1700,7 +1700,7 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table); · 231 unmodified lines
1700#endif1700#endif
1701 1701
1702static struct platform_driver dw_driver = {1702static struct platform_driver dw_driver = {
1703 .remove = __devexit_p(dw_remove),1703 .remove = dw_remove,
1704 .shutdown = dw_shutdown,1704 .shutdown = dw_shutdown,
1705 .driver = {1705 .driver = {
1706 .name = "dw_dmac",1706 .name = "dw_dmac",
drivers/dma/edma.c+2−2
@@ -545,7 +545,7 @@ static void edma_dma_init(struct edma_cc *ecc, struct dma_device *dma, · 544 unmodified lines
545 INIT_LIST_HEAD(&dma->channels);545 INIT_LIST_HEAD(&dma->channels);
546}546}
547 547
548static int __devinit edma_probe(struct platform_device *pdev)548static int edma_probe(struct platform_device *pdev)
549{549{
550 struct edma_cc *ecc;550 struct edma_cc *ecc;
551 int ret;551 int ret;
@@ -598,7 +598,7 @@ static int __devexit edma_remove(struct platform_device *pdev) · 46 unmodified lines
598 598
599static struct platform_driver edma_driver = {599static struct platform_driver edma_driver = {
600 .probe = edma_probe,600 .probe = edma_probe,
601 .remove = __devexit_p(edma_remove),601 .remove = edma_remove,
602 .driver = {602 .driver = {
603 .name = "edma-dma-engine",603 .name = "edma-dma-engine",
604 .owner = THIS_MODULE,604 .owner = THIS_MODULE,
drivers/dma/fsldma.c+2−2
@@ -1221,7 +1221,7 @@ out_unwind: · 1220 unmodified lines
1221/* OpenFirmware Subsystem */1221/* OpenFirmware Subsystem */
1222/*----------------------------------------------------------------------------*/1222/*----------------------------------------------------------------------------*/
1223 1223
1224static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,1224static int fsl_dma_chan_probe(struct fsldma_device *fdev,
1225 struct device_node *node, u32 feature, const char *compatible)1225 struct device_node *node, u32 feature, const char *compatible)
1226{1226{
1227 struct fsldma_chan *chan;1227 struct fsldma_chan *chan;
@@ -1324,7 +1324,7 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan) · 96 unmodified lines
1324 kfree(chan);1324 kfree(chan);
1325}1325}
1326 1326
1327static int __devinit fsldma_of_probe(struct platform_device *op)1327static int fsldma_of_probe(struct platform_device *op)
1328{1328{
1329 struct fsldma_device *fdev;1329 struct fsldma_device *fdev;
1330 struct device_node *child;1330 struct device_node *child;
drivers/dma/intel_mid_dma.c+2−2
@@ -1225,7 +1225,7 @@ static void middma_shutdown(struct pci_dev *pdev) · 1224 unmodified lines
1225 * Initialize the PCI device, map BARs, query driver data.1225 * Initialize the PCI device, map BARs, query driver data.
1226 * Call setup_dma to complete contoller and chan initilzation1226 * Call setup_dma to complete contoller and chan initilzation
1227 */1227 */
1228static int __devinit intel_mid_dma_probe(struct pci_dev *pdev,1228static int intel_mid_dma_probe(struct pci_dev *pdev,
1229 const struct pci_device_id *id)1229 const struct pci_device_id *id)
1230{1230{
1231 struct middma_device *device;1231 struct middma_device *device;
@@ -1432,7 +1432,7 @@ static struct pci_driver intel_mid_dma_pci_driver = { · 200 unmodified lines
1432 .name = "Intel MID DMA",1432 .name = "Intel MID DMA",
1433 .id_table = intel_mid_dma_ids,1433 .id_table = intel_mid_dma_ids,
1434 .probe = intel_mid_dma_probe,1434 .probe = intel_mid_dma_probe,
1435 .remove = __devexit_p(intel_mid_dma_remove),1435 .remove = intel_mid_dma_remove,
1436#ifdef CONFIG_PM1436#ifdef CONFIG_PM
1437 .driver = {1437 .driver = {
1438 .pm = &intel_mid_dma_pm,1438 .pm = &intel_mid_dma_pm,
drivers/dma/ioat/pci.c+1−1
@@ -125,7 +125,7 @@ static struct pci_driver ioat_pci_driver = { · 124 unmodified lines
125 .name = DRV_NAME,125 .name = DRV_NAME,
126 .id_table = ioat_pci_tbl,126 .id_table = ioat_pci_tbl,
127 .probe = ioat_pci_probe,127 .probe = ioat_pci_probe,
128 .remove = __devexit_p(ioat_remove),128 .remove = ioat_remove,
129};129};
130 130
131static struct ioatdma_device *131static struct ioatdma_device *
drivers/dma/iop-adma.c+5−5
@@ -968,7 +968,7 @@ static void iop_adma_issue_pending(struct dma_chan *chan) · 967 unmodified lines
968 */968 */
969#define IOP_ADMA_TEST_SIZE 2000969#define IOP_ADMA_TEST_SIZE 2000
970 970
971static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)971static int iop_adma_memcpy_self_test(struct iop_adma_device *device)
972{972{
973 int i;973 int i;
974 void *src, *dest;974 void *src, *dest;
@@ -1042,7 +1042,7 @@ out: · 67 unmodified lines
1042}1042}
1043 1043
1044#define IOP_ADMA_NUM_SRC_TEST 4 /* must be <= 15 */1044#define IOP_ADMA_NUM_SRC_TEST 4 /* must be <= 15 */
1045static int __devinit1045static int
1046iop_adma_xor_val_self_test(struct iop_adma_device *device)1046iop_adma_xor_val_self_test(struct iop_adma_device *device)
1047{1047{
1048 int i, src_idx;1048 int i, src_idx;
@@ -1243,7 +1243,7 @@ out: · 194 unmodified lines
1243}1243}
1244 1244
1245#ifdef CONFIG_RAID6_PQ1245#ifdef CONFIG_RAID6_PQ
1246static int __devinit1246static int
1247iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)1247iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
1248{1248{
1249 /* combined sources, software pq results, and extra hw pq results */1249 /* combined sources, software pq results, and extra hw pq results */
@@ -1429,7 +1429,7 @@ static int __devexit iop_adma_remove(struct platform_device *dev) · 179 unmodified lines
1429 return 0;1429 return 0;
1430}1430}
1431 1431
1432static int __devinit iop_adma_probe(struct platform_device *pdev)1432static int iop_adma_probe(struct platform_device *pdev)
1433{1433{
1434 struct resource *res;1434 struct resource *res;
1435 int ret = 0, i;1435 int ret = 0, i;
@@ -1711,7 +1711,7 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan) · 275 unmodified lines
1711 1711
1712static struct platform_driver iop_adma_driver = {1712static struct platform_driver iop_adma_driver = {
1713 .probe = iop_adma_probe,1713 .probe = iop_adma_probe,
1714 .remove = __devexit_p(iop_adma_remove),1714 .remove = iop_adma_remove,
1715 .driver = {1715 .driver = {
1716 .owner = THIS_MODULE,1716 .owner = THIS_MODULE,
1717 .name = "iop-adma",1717 .name = "iop-adma",
drivers/dma/mmp_pdma.c+3−3
@@ -720,7 +720,7 @@ static int __devexit mmp_pdma_remove(struct platform_device *op) · 719 unmodified lines
720 return 0;720 return 0;
721}721}
722 722
723static int __devinit mmp_pdma_chan_init(struct mmp_pdma_device *pdev,723static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev,
724 int idx, int irq)724 int idx, int irq)
725{725{
726 struct mmp_pdma_phy *phy = &pdev->phy[idx];726 struct mmp_pdma_phy *phy = &pdev->phy[idx];
@@ -764,7 +764,7 @@ static struct of_device_id mmp_pdma_dt_ids[] = { · 37 unmodified lines
764};764};
765MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids);765MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids);
766 766
767static int __devinit mmp_pdma_probe(struct platform_device *op)767static int mmp_pdma_probe(struct platform_device *op)
768{768{
769 struct mmp_pdma_device *pdev;769 struct mmp_pdma_device *pdev;
770 const struct of_device_id *of_id;770 const struct of_device_id *of_id;
@@ -865,7 +865,7 @@ static struct platform_driver mmp_pdma_driver = { · 94 unmodified lines
865 },865 },
866 .id_table = mmp_pdma_id_table,866 .id_table = mmp_pdma_id_table,
867 .probe = mmp_pdma_probe,867 .probe = mmp_pdma_probe,
868 .remove = __devexit_p(mmp_pdma_remove),868 .remove = mmp_pdma_remove,
869};869};
870 870
871module_platform_driver(mmp_pdma_driver);871module_platform_driver(mmp_pdma_driver);
drivers/dma/mmp_tdma.c+3−3
@@ -475,7 +475,7 @@ static int __devexit mmp_tdma_remove(struct platform_device *pdev) · 474 unmodified lines
475 return 0;475 return 0;
476}476}
477 477
478static int __devinit mmp_tdma_chan_init(struct mmp_tdma_device *tdev,478static int mmp_tdma_chan_init(struct mmp_tdma_device *tdev,
479 int idx, int irq, int type)479 int idx, int irq, int type)
480{480{
481 struct mmp_tdma_chan *tdmac;481 struct mmp_tdma_chan *tdmac;
@@ -515,7 +515,7 @@ static struct of_device_id mmp_tdma_dt_ids[] = { · 33 unmodified lines
515};515};
516MODULE_DEVICE_TABLE(of, mmp_tdma_dt_ids);516MODULE_DEVICE_TABLE(of, mmp_tdma_dt_ids);
517 517
518static int __devinit mmp_tdma_probe(struct platform_device *pdev)518static int mmp_tdma_probe(struct platform_device *pdev)
519{519{
520 enum mmp_tdma_type type;520 enum mmp_tdma_type type;
521 const struct of_device_id *of_id;521 const struct of_device_id *of_id;
@@ -609,7 +609,7 @@ static struct platform_driver mmp_tdma_driver = { · 87 unmodified lines
609 },609 },
610 .id_table = mmp_tdma_id_table,610 .id_table = mmp_tdma_id_table,
611 .probe = mmp_tdma_probe,611 .probe = mmp_tdma_probe,
612 .remove = __devexit_p(mmp_tdma_remove),612 .remove = mmp_tdma_remove,
613};613};
614 614
615module_platform_driver(mmp_tdma_driver);615module_platform_driver(mmp_tdma_driver);
drivers/dma/mpc512x_dma.c+2−2
@@ -641,7 +641,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, · 640 unmodified lines
641 return &mdesc->desc;641 return &mdesc->desc;
642}642}
643 643
644static int __devinit mpc_dma_probe(struct platform_device *op)644static int mpc_dma_probe(struct platform_device *op)
645{645{
646 struct device_node *dn = op->dev.of_node;646 struct device_node *dn = op->dev.of_node;
647 struct device *dev = &op->dev;647 struct device *dev = &op->dev;
@@ -818,7 +818,7 @@ static struct of_device_id mpc_dma_match[] = { · 170 unmodified lines
818 818
819static struct platform_driver mpc_dma_driver = {819static struct platform_driver mpc_dma_driver = {
820 .probe = mpc_dma_probe,820 .probe = mpc_dma_probe,
821 .remove = __devexit_p(mpc_dma_remove),821 .remove = mpc_dma_remove,
822 .driver = {822 .driver = {
823 .name = DRV_NAME,823 .name = DRV_NAME,
824 .owner = THIS_MODULE,824 .owner = THIS_MODULE,
drivers/dma/mv_xor.c+4−4
@@ -901,7 +901,7 @@ static void mv_xor_issue_pending(struct dma_chan *chan) · 900 unmodified lines
901 */901 */
902#define MV_XOR_TEST_SIZE 2000902#define MV_XOR_TEST_SIZE 2000
903 903
904static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)904static int mv_xor_memcpy_self_test(struct mv_xor_device *device)
905{905{
906 int i;906 int i;
907 void *src, *dest;907 void *src, *dest;
@@ -975,7 +975,7 @@ out: · 67 unmodified lines
975}975}
976 976
977#define MV_XOR_NUM_SRC_TEST 4 /* must be <= 15 */977#define MV_XOR_NUM_SRC_TEST 4 /* must be <= 15 */
978static int __devinit978static int
979mv_xor_xor_self_test(struct mv_xor_device *device)979mv_xor_xor_self_test(struct mv_xor_device *device)
980{980{
981 int i, src_idx;981 int i, src_idx;
@@ -1100,7 +1100,7 @@ static int __devexit mv_xor_remove(struct platform_device *dev) · 118 unmodified lines
1100 return 0;1100 return 0;
1101}1101}
1102 1102
1103static int __devinit mv_xor_probe(struct platform_device *pdev)1103static int mv_xor_probe(struct platform_device *pdev)
1104{1104{
1105 int ret = 0;1105 int ret = 0;
1106 int irq;1106 int irq;
@@ -1262,7 +1262,7 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp, · 155 unmodified lines
1262 1262
1263static struct platform_driver mv_xor_driver = {1263static struct platform_driver mv_xor_driver = {
1264 .probe = mv_xor_probe,1264 .probe = mv_xor_probe,
1265 .remove = __devexit_p(mv_xor_remove),1265 .remove = mv_xor_remove,
1266 .driver = {1266 .driver = {
1267 .owner = THIS_MODULE,1267 .owner = THIS_MODULE,
1268 .name = MV_XOR_NAME,1268 .name = MV_XOR_NAME,
drivers/dma/pch_dma.c+2−2
@@ -843,7 +843,7 @@ static int pch_dma_resume(struct pci_dev *pdev) · 842 unmodified lines
843}843}
844#endif844#endif
845 845
846static int __devinit pch_dma_probe(struct pci_dev *pdev,846static int pch_dma_probe(struct pci_dev *pdev,
847 const struct pci_device_id *id)847 const struct pci_device_id *id)
848{848{
849 struct pch_dma *pd;849 struct pch_dma *pd;
@@ -1022,7 +1022,7 @@ static struct pci_driver pch_dma_driver = { · 172 unmodified lines
1022 .name = DRV_NAME,1022 .name = DRV_NAME,
1023 .id_table = pch_dma_id_table,1023 .id_table = pch_dma_id_table,
1024 .probe = pch_dma_probe,1024 .probe = pch_dma_probe,
1025 .remove = __devexit_p(pch_dma_remove),1025 .remove = pch_dma_remove,
1026#ifdef CONFIG_PM1026#ifdef CONFIG_PM
1027 .suspend = pch_dma_suspend,1027 .suspend = pch_dma_suspend,
1028 .resume = pch_dma_resume,1028 .resume = pch_dma_resume,
drivers/dma/pl330.c+1−1
@@ -2851,7 +2851,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data) · 2850 unmodified lines
2851 return IRQ_NONE;2851 return IRQ_NONE;
2852}2852}
2853 2853
2854static int __devinit2854static int
2855pl330_probe(struct amba_device *adev, const struct amba_id *id)2855pl330_probe(struct amba_device *adev, const struct amba_id *id)
2856{2856{
2857 struct dma_pl330_platdata *pdat;2857 struct dma_pl330_platdata *pdat;
drivers/dma/ppc4xx/adma.c+2−2
@@ -4361,7 +4361,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, · 4360 unmodified lines
4361/**4361/**
4362 * ppc440spe_adma_probe - probe the asynch device4362 * ppc440spe_adma_probe - probe the asynch device
4363 */4363 */
4364static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev)4364static int ppc440spe_adma_probe(struct platform_device *ofdev)
4365{4365{
4366 struct device_node *np = ofdev->dev.of_node;4366 struct device_node *np = ofdev->dev.of_node;
4367 struct resource res;4367 struct resource res;
@@ -4914,7 +4914,7 @@ MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match); · 546 unmodified lines
4914 4914
4915static struct platform_driver ppc440spe_adma_driver = {4915static struct platform_driver ppc440spe_adma_driver = {
4916 .probe = ppc440spe_adma_probe,4916 .probe = ppc440spe_adma_probe,
4917 .remove = __devexit_p(ppc440spe_adma_remove),4917 .remove = ppc440spe_adma_remove,
4918 .driver = {4918 .driver = {
4919 .name = "PPC440SP(E)-ADMA",4919 .name = "PPC440SP(E)-ADMA",
4920 .owner = THIS_MODULE,4920 .owner = THIS_MODULE,
drivers/dma/sa11x0-dma.c+3−3
@@ -826,7 +826,7 @@ static const struct sa11x0_dma_channel_desc chan_desc[] = { · 825 unmodified lines
826 CD(Ser4SSPRc, DDAR_RW),826 CD(Ser4SSPRc, DDAR_RW),
827};827};
828 828
829static int __devinit sa11x0_dma_init_dmadev(struct dma_device *dmadev,829static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
830 struct device *dev)830 struct device *dev)
831{831{
832 unsigned i;832 unsigned i;
@@ -891,7 +891,7 @@ static void sa11x0_dma_free_channels(struct dma_device *dmadev) · 58 unmodified lines
891 }891 }
892}892}
893 893
894static int __devinit sa11x0_dma_probe(struct platform_device *pdev)894static int sa11x0_dma_probe(struct platform_device *pdev)
895{895{
896 struct sa11x0_dma_dev *d;896 struct sa11x0_dma_dev *d;
897 struct resource *res;897 struct resource *res;
@@ -1072,7 +1072,7 @@ static struct platform_driver sa11x0_dma_driver = { · 174 unmodified lines
1072 .pm = &sa11x0_dma_pm_ops,1072 .pm = &sa11x0_dma_pm_ops,
1073 },1073 },
1074 .probe = sa11x0_dma_probe,1074 .probe = sa11x0_dma_probe,
1075 .remove = __devexit_p(sa11x0_dma_remove),1075 .remove = sa11x0_dma_remove,
1076};1076};
1077 1077
1078bool sa11x0_dma_filter_fn(struct dma_chan *chan, void *param)1078bool sa11x0_dma_filter_fn(struct dma_chan *chan, void *param)
drivers/dma/sh/shdma.c+3−3
@@ -483,7 +483,7 @@ static struct notifier_block sh_dmae_nmi_notifier __read_mostly = { · 482 unmodified lines
483 .priority = 1,483 .priority = 1,
484};484};
485 485
486static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id,486static int sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id,
487 int irq, unsigned long flags)487 int irq, unsigned long flags)
488{488{
489 const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id];489 const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id];
@@ -646,7 +646,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { · 156 unmodified lines
646 .get_partial = sh_dmae_get_partial,646 .get_partial = sh_dmae_get_partial,
647};647};
648 648
649static int __devinit sh_dmae_probe(struct platform_device *pdev)649static int sh_dmae_probe(struct platform_device *pdev)
650{650{
651 struct sh_dmae_pdata *pdata = pdev->dev.platform_data;651 struct sh_dmae_pdata *pdata = pdev->dev.platform_data;
652 unsigned long irqflags = IRQF_DISABLED,652 unsigned long irqflags = IRQF_DISABLED,
@@ -926,7 +926,7 @@ static struct platform_driver sh_dmae_driver = { · 273 unmodified lines
926 .pm = &sh_dmae_pm,926 .pm = &sh_dmae_pm,
927 .name = SH_DMAE_DRV_NAME,927 .name = SH_DMAE_DRV_NAME,
928 },928 },
929 .remove = __devexit_p(sh_dmae_remove),929 .remove = sh_dmae_remove,
930 .shutdown = sh_dmae_shutdown,930 .shutdown = sh_dmae_shutdown,
931};931};
932 932
drivers/dma/sirf-dma.c+2−2
@@ -550,7 +550,7 @@ bool sirfsoc_dma_filter_id(struct dma_chan *chan, void *chan_id) · 549 unmodified lines
550}550}
551EXPORT_SYMBOL(sirfsoc_dma_filter_id);551EXPORT_SYMBOL(sirfsoc_dma_filter_id);
552 552
553static int __devinit sirfsoc_dma_probe(struct platform_device *op)553static int sirfsoc_dma_probe(struct platform_device *op)
554{554{
555 struct device_node *dn = op->dev.of_node;555 struct device_node *dn = op->dev.of_node;
556 struct device *dev = &op->dev;556 struct device *dev = &op->dev;
@@ -673,7 +673,7 @@ static struct of_device_id sirfsoc_dma_match[] = { · 116 unmodified lines
673 673
674static struct platform_driver sirfsoc_dma_driver = {674static struct platform_driver sirfsoc_dma_driver = {
675 .probe = sirfsoc_dma_probe,675 .probe = sirfsoc_dma_probe,
676 .remove = __devexit_p(sirfsoc_dma_remove),676 .remove = sirfsoc_dma_remove,
677 .driver = {677 .driver = {
678 .name = DRV_NAME,678 .name = DRV_NAME,
679 .owner = THIS_MODULE,679 .owner = THIS_MODULE,
drivers/dma/tegra20-apb-dma.c+2−2
@@ -1197,7 +1197,7 @@ static const struct of_device_id tegra_dma_of_match[] __devinitconst = { · 1196 unmodified lines
1197MODULE_DEVICE_TABLE(of, tegra_dma_of_match);1197MODULE_DEVICE_TABLE(of, tegra_dma_of_match);
1198#endif1198#endif
1199 1199
1200static int __devinit tegra_dma_probe(struct platform_device *pdev)1200static int tegra_dma_probe(struct platform_device *pdev)
1201{1201{
1202 struct resource *res;1202 struct resource *res;
1203 struct tegra_dma *tdma;1203 struct tegra_dma *tdma;
@@ -1418,7 +1418,7 @@ static struct platform_driver tegra_dmac_driver = { · 214 unmodified lines
1418 .of_match_table = of_match_ptr(tegra_dma_of_match),1418 .of_match_table = of_match_ptr(tegra_dma_of_match),
1419 },1419 },
1420 .probe = tegra_dma_probe,1420 .probe = tegra_dma_probe,
1421 .remove = __devexit_p(tegra_dma_remove),1421 .remove = tegra_dma_remove,
1422};1422};
1423 1423
1424module_platform_driver(tegra_dmac_driver);1424module_platform_driver(tegra_dmac_driver);
drivers/dma/timb_dma.c+1−1
@@ -667,7 +667,7 @@ static irqreturn_t td_irq(int irq, void *devid) · 666 unmodified lines
667}667}
668 668
669 669
670static int __devinit td_probe(struct platform_device *pdev)670static int td_probe(struct platform_device *pdev)
671{671{
672 struct timb_dma_platform_data *pdata = pdev->dev.platform_data;672 struct timb_dma_platform_data *pdata = pdev->dev.platform_data;
673 struct timb_dma *td;673 struct timb_dma *td;
drivers/firewire/nosy.c+2−2
@@ -529,7 +529,7 @@ remove_card(struct pci_dev *dev) · 528 unmodified lines
529 529
530#define RCV_BUFFER_SIZE (16 * 1024)530#define RCV_BUFFER_SIZE (16 * 1024)
531 531
532static int __devinit532static int
533add_card(struct pci_dev *dev, const struct pci_device_id *unused)533add_card(struct pci_dev *dev, const struct pci_device_id *unused)
534{534{
535 struct pcilynx *lynx;535 struct pcilynx *lynx;
@@ -683,7 +683,7 @@ fail_disable: · 147 unmodified lines
683 return ret;683 return ret;
684}684}
685 685
686static struct pci_device_id pci_table[] __devinitdata = {686static struct pci_device_id pci_table[] = {
687 {687 {
688 .vendor = PCI_VENDOR_ID_TI,688 .vendor = PCI_VENDOR_ID_TI,
689 .device = PCI_DEVICE_ID_TI_PCILYNX,689 .device = PCI_DEVICE_ID_TI_PCILYNX,
drivers/firewire/ohci.c+1−1
@@ -3537,7 +3537,7 @@ static inline void pmac_ohci_on(struct pci_dev *dev) {} · 3536 unmodified lines
3537static inline void pmac_ohci_off(struct pci_dev *dev) {}3537static inline void pmac_ohci_off(struct pci_dev *dev) {}
3538#endif /* CONFIG_PPC_PMAC */3538#endif /* CONFIG_PPC_PMAC */
3539 3539
3540static int __devinit pci_probe(struct pci_dev *dev,3540static int pci_probe(struct pci_dev *dev,
3541 const struct pci_device_id *ent)3541 const struct pci_device_id *ent)
3542{3542{
3543 struct fw_ohci *ohci;3543 struct fw_ohci *ohci;
drivers/gpio/gpio-74x164.c+3−3
@@ -105,7 +105,7 @@ static int gen_74x164_direction_output(struct gpio_chip *gc, · 104 unmodified lines
105 return 0;105 return 0;
106}106}
107 107
108static int __devinit gen_74x164_probe(struct spi_device *spi)108static int gen_74x164_probe(struct spi_device *spi)
109{109{
110 struct gen_74x164_chip *chip;110 struct gen_74x164_chip *chip;
111 struct gen_74x164_chip_platform_data *pdata;111 struct gen_74x164_chip_platform_data *pdata;
@@ -181,7 +181,7 @@ exit_destroy: · 69 unmodified lines
181 return ret;181 return ret;
182}182}
183 183
184static int __devexit gen_74x164_remove(struct spi_device *spi)184static int gen_74x164_remove(struct spi_device *spi)
185{185{
186 struct gen_74x164_chip *chip;186 struct gen_74x164_chip *chip;
187 int ret;187 int ret;
@@ -215,7 +215,7 @@ static struct spi_driver gen_74x164_driver = { · 27 unmodified lines
215 .of_match_table = of_match_ptr(gen_74x164_dt_ids),215 .of_match_table = of_match_ptr(gen_74x164_dt_ids),
216 },216 },
217 .probe = gen_74x164_probe,217 .probe = gen_74x164_probe,
218 .remove = __devexit_p(gen_74x164_remove),218 .remove = gen_74x164_remove,
219};219};
220module_spi_driver(gen_74x164_driver);220module_spi_driver(gen_74x164_driver);
221 221
drivers/gpio/gpio-ab8500.c+3−3
@@ -402,7 +402,7 @@ static void ab8500_gpio_irq_remove(struct ab8500_gpio *ab8500_gpio) · 401 unmodified lines
402 }402 }
403}403}
404 404
405static int __devinit ab8500_gpio_probe(struct platform_device *pdev)405static int ab8500_gpio_probe(struct platform_device *pdev)
406{406{
407 struct ab8500_platform_data *ab8500_pdata =407 struct ab8500_platform_data *ab8500_pdata =
408 dev_get_platdata(pdev->dev.parent);408 dev_get_platdata(pdev->dev.parent);
@@ -474,7 +474,7 @@ out_free: · 65 unmodified lines
474 * ab8500_gpio_remove() - remove Ab8500-gpio driver474 * ab8500_gpio_remove() - remove Ab8500-gpio driver
475 * @pdev : Platform device registered475 * @pdev : Platform device registered
476 */476 */
477static int __devexit ab8500_gpio_remove(struct platform_device *pdev)477static int ab8500_gpio_remove(struct platform_device *pdev)
478{478{
479 struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev);479 struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev);
480 int ret;480 int ret;
@@ -499,7 +499,7 @@ static struct platform_driver ab8500_gpio_driver = { · 18 unmodified lines
499 .owner = THIS_MODULE,499 .owner = THIS_MODULE,
500 },500 },
501 .probe = ab8500_gpio_probe,501 .probe = ab8500_gpio_probe,
502 .remove = __devexit_p(ab8500_gpio_remove),502 .remove = ab8500_gpio_remove,
503};503};
504 504
505static int __init ab8500_gpio_init(void)505static int __init ab8500_gpio_init(void)
drivers/gpio/gpio-adnp.c+5−5
@@ -516,7 +516,7 @@ static void adnp_irq_teardown(struct adnp *adnp) · 515 unmodified lines
516 irq_domain_remove(adnp->domain);516 irq_domain_remove(adnp->domain);
517}517}
518 518
519static __devinit int adnp_i2c_probe(struct i2c_client *client,519static int adnp_i2c_probe(struct i2c_client *client,
520 const struct i2c_device_id *id)520 const struct i2c_device_id *id)
521{521{
522 struct device_node *np = client->dev.of_node;522 struct device_node *np = client->dev.of_node;
@@ -563,7 +563,7 @@ teardown: · 40 unmodified lines
563 return err;563 return err;
564}564}
565 565
566static __devexit int adnp_i2c_remove(struct i2c_client *client)566static int adnp_i2c_remove(struct i2c_client *client)
567{567{
568 struct adnp *adnp = i2c_get_clientdata(client);568 struct adnp *adnp = i2c_get_clientdata(client);
569 struct device_node *np = client->dev.of_node;569 struct device_node *np = client->dev.of_node;
@@ -582,13 +582,13 @@ static __devexit int adnp_i2c_remove(struct i2c_client *client) · 12 unmodified lines
582 return 0;582 return 0;
583}583}
584 584
585static const struct i2c_device_id adnp_i2c_id[] __devinitconst = {585static const struct i2c_device_id adnp_i2c_id[] = {
586 { "gpio-adnp" },586 { "gpio-adnp" },
587 { },587 { },
588};588};
589MODULE_DEVICE_TABLE(i2c, adnp_i2c_id);589MODULE_DEVICE_TABLE(i2c, adnp_i2c_id);
590 590
591static const struct of_device_id adnp_of_match[] __devinitconst = {591static const struct of_device_id adnp_of_match[] = {
592 { .compatible = "ad,gpio-adnp", },592 { .compatible = "ad,gpio-adnp", },
593 { },593 { },
594};594};
@@ -601,7 +601,7 @@ static struct i2c_driver adnp_i2c_driver = { · 6 unmodified lines
601 .of_match_table = of_match_ptr(adnp_of_match),601 .of_match_table = of_match_ptr(adnp_of_match),
602 },602 },
603 .probe = adnp_i2c_probe,603 .probe = adnp_i2c_probe,
604 .remove = __devexit_p(adnp_i2c_remove),604 .remove = adnp_i2c_remove,
605 .id_table = adnp_i2c_id,605 .id_table = adnp_i2c_id,
606};606};
607module_i2c_driver(adnp_i2c_driver);607module_i2c_driver(adnp_i2c_driver);
drivers/gpio/gpio-adp5520.c+3−3
@@ -87,7 +87,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip, · 86 unmodified lines
87 return ret;87 return ret;
88}88}
89 89
90static int __devinit adp5520_gpio_probe(struct platform_device *pdev)90static int adp5520_gpio_probe(struct platform_device *pdev)
91{91{
92 struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;92 struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;
93 struct adp5520_gpio *dev;93 struct adp5520_gpio *dev;
@@ -167,7 +167,7 @@ err: · 73 unmodified lines
167 return ret;167 return ret;
168}168}
169 169
170static int __devexit adp5520_gpio_remove(struct platform_device *pdev)170static int adp5520_gpio_remove(struct platform_device *pdev)
171{171{
172 struct adp5520_gpio *dev;172 struct adp5520_gpio *dev;
173 int ret;173 int ret;
@@ -190,7 +190,7 @@ static struct platform_driver adp5520_gpio_driver = { · 16 unmodified lines
190 .owner = THIS_MODULE,190 .owner = THIS_MODULE,
191 },191 },
192 .probe = adp5520_gpio_probe,192 .probe = adp5520_gpio_probe,
193 .remove = __devexit_p(adp5520_gpio_remove),193 .remove = adp5520_gpio_remove,
194};194};
195 195
196module_platform_driver(adp5520_gpio_driver);196module_platform_driver(adp5520_gpio_driver);
drivers/gpio/gpio-adp5588.c+3−3
@@ -346,7 +346,7 @@ static void adp5588_irq_teardown(struct adp5588_gpio *dev) · 345 unmodified lines
346}346}
347#endif /* CONFIG_GPIO_ADP5588_IRQ */347#endif /* CONFIG_GPIO_ADP5588_IRQ */
348 348
349static int __devinit adp5588_gpio_probe(struct i2c_client *client,349static int adp5588_gpio_probe(struct i2c_client *client,
350 const struct i2c_device_id *id)350 const struct i2c_device_id *id)
351{351{
352 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;352 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
@@ -438,7 +438,7 @@ err: · 85 unmodified lines
438 return ret;438 return ret;
439}439}
440 440
441static int __devexit adp5588_gpio_remove(struct i2c_client *client)441static int adp5588_gpio_remove(struct i2c_client *client)
442{442{
443 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;443 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
444 struct adp5588_gpio *dev = i2c_get_clientdata(client);444 struct adp5588_gpio *dev = i2c_get_clientdata(client);
@@ -479,7 +479,7 @@ static struct i2c_driver adp5588_gpio_driver = { · 34 unmodified lines
479 .name = DRV_NAME,479 .name = DRV_NAME,
480 },480 },
481 .probe = adp5588_gpio_probe,481 .probe = adp5588_gpio_probe,
482 .remove = __devexit_p(adp5588_gpio_remove),482 .remove = adp5588_gpio_remove,
483 .id_table = adp5588_gpio_id,483 .id_table = adp5588_gpio_id,
484};484};
485 485
drivers/gpio/gpio-arizona.c+3−3
@@ -94,7 +94,7 @@ static struct gpio_chip template_chip = { · 93 unmodified lines
94 .can_sleep = 1,94 .can_sleep = 1,
95};95};
96 96
97static int __devinit arizona_gpio_probe(struct platform_device *pdev)97static int arizona_gpio_probe(struct platform_device *pdev)
98{98{
99 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);99 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
100 struct arizona_pdata *pdata = arizona->dev->platform_data;100 struct arizona_pdata *pdata = arizona->dev->platform_data;
@@ -141,7 +141,7 @@ err: · 40 unmodified lines
141 return ret;141 return ret;
142}142}
143 143
144static int __devexit arizona_gpio_remove(struct platform_device *pdev)144static int arizona_gpio_remove(struct platform_device *pdev)
145{145{
146 struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);146 struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
147 147
@@ -152,7 +152,7 @@ static struct platform_driver arizona_gpio_driver = { · 4 unmodified lines
152 .driver.name = "arizona-gpio",152 .driver.name = "arizona-gpio",
153 .driver.owner = THIS_MODULE,153 .driver.owner = THIS_MODULE,
154 .probe = arizona_gpio_probe,154 .probe = arizona_gpio_probe,
155 .remove = __devexit_p(arizona_gpio_remove),155 .remove = arizona_gpio_remove,
156};156};
157 157
158module_platform_driver(arizona_gpio_driver);158module_platform_driver(arizona_gpio_driver);
drivers/gpio/gpio-cs5535.c+3−3
@@ -300,7 +300,7 @@ static struct cs5535_gpio_chip cs5535_gpio_chip = { · 299 unmodified lines
300 },300 },
301};301};
302 302
303static int __devinit cs5535_gpio_probe(struct platform_device *pdev)303static int cs5535_gpio_probe(struct platform_device *pdev)
304{304{
305 struct resource *res;305 struct resource *res;
306 int err = -EIO;306 int err = -EIO;
@@ -355,7 +355,7 @@ done: · 48 unmodified lines
355 return err;355 return err;
356}356}
357 357
358static int __devexit cs5535_gpio_remove(struct platform_device *pdev)358static int cs5535_gpio_remove(struct platform_device *pdev)
359{359{
360 struct resource *r;360 struct resource *r;
361 int err;361 int err;
@@ -378,7 +378,7 @@ static struct platform_driver cs5535_gpio_driver = { · 16 unmodified lines
378 .owner = THIS_MODULE,378 .owner = THIS_MODULE,
379 },379 },
380 .probe = cs5535_gpio_probe,380 .probe = cs5535_gpio_probe,
381 .remove = __devexit_p(cs5535_gpio_remove),381 .remove = cs5535_gpio_remove,
382};382};
383 383
384module_platform_driver(cs5535_gpio_driver);384module_platform_driver(cs5535_gpio_driver);
drivers/gpio/gpio-da9052.c+4−4
@@ -188,7 +188,7 @@ static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset) · 187 unmodified lines
188 return da9052->irq_base + DA9052_IRQ_GPI0 + offset;188 return da9052->irq_base + DA9052_IRQ_GPI0 + offset;
189}189}
190 190
191static struct gpio_chip reference_gp __devinitdata = {191static struct gpio_chip reference_gp = {
192 .label = "da9052-gpio",192 .label = "da9052-gpio",
193 .owner = THIS_MODULE,193 .owner = THIS_MODULE,
194 .get = da9052_gpio_get,194 .get = da9052_gpio_get,
@@ -201,7 +201,7 @@ static struct gpio_chip reference_gp __devinitdata = { · 6 unmodified lines
201 .base = -1,201 .base = -1,
202};202};
203 203
204static int __devinit da9052_gpio_probe(struct platform_device *pdev)204static int da9052_gpio_probe(struct platform_device *pdev)
205{205{
206 struct da9052_gpio *gpio;206 struct da9052_gpio *gpio;
207 struct da9052_pdata *pdata;207 struct da9052_pdata *pdata;
@@ -229,7 +229,7 @@ static int __devinit da9052_gpio_probe(struct platform_device *pdev) · 21 unmodified lines
229 return 0;229 return 0;
230}230}
231 231
232static int __devexit da9052_gpio_remove(struct platform_device *pdev)232static int da9052_gpio_remove(struct platform_device *pdev)
233{233{
234 struct da9052_gpio *gpio = platform_get_drvdata(pdev);234 struct da9052_gpio *gpio = platform_get_drvdata(pdev);
235 235
@@ -238,7 +238,7 @@ static int __devexit da9052_gpio_remove(struct platform_device *pdev) · 2 unmodified lines
238 238
239static struct platform_driver da9052_gpio_driver = {239static struct platform_driver da9052_gpio_driver = {
240 .probe = da9052_gpio_probe,240 .probe = da9052_gpio_probe,
241 .remove = __devexit_p(da9052_gpio_remove),241 .remove = da9052_gpio_remove,
242 .driver = {242 .driver = {
243 .name = "da9052-gpio",243 .name = "da9052-gpio",
244 .owner = THIS_MODULE,244 .owner = THIS_MODULE,
drivers/gpio/gpio-em.c+3−3
@@ -233,7 +233,7 @@ static struct irq_domain_ops em_gio_irq_domain_ops = { · 232 unmodified lines
233 .map = em_gio_irq_domain_map,233 .map = em_gio_irq_domain_map,
234};234};
235 235
236static int __devinit em_gio_probe(struct platform_device *pdev)236static int em_gio_probe(struct platform_device *pdev)
237{237{
238 struct gpio_em_config *pdata = pdev->dev.platform_data;238 struct gpio_em_config *pdata = pdev->dev.platform_data;
239 struct em_gio_priv *p;239 struct em_gio_priv *p;
@@ -343,7 +343,7 @@ err0: · 103 unmodified lines
343 return ret;343 return ret;
344}344}
345 345
346static int __devexit em_gio_remove(struct platform_device *pdev)346static int em_gio_remove(struct platform_device *pdev)
347{347{
348 struct em_gio_priv *p = platform_get_drvdata(pdev);348 struct em_gio_priv *p = platform_get_drvdata(pdev);
349 struct resource *irq[2];349 struct resource *irq[2];
@@ -367,7 +367,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev) · 17 unmodified lines
367 367
368static struct platform_driver em_gio_device_driver = {368static struct platform_driver em_gio_device_driver = {
369 .probe = em_gio_probe,369 .probe = em_gio_probe,
370 .remove = __devexit_p(em_gio_remove),370 .remove = em_gio_remove,
371 .driver = {371 .driver = {
372 .name = "em_gio",372 .name = "em_gio",
373 }373 }
drivers/gpio/gpio-ep93xx.c+1−1
@@ -340,7 +340,7 @@ static int ep93xx_gpio_add_bank(struct bgpio_chip *bgc, struct device *dev, · 339 unmodified lines
340 return gpiochip_add(&bgc->gc);340 return gpiochip_add(&bgc->gc);
341}341}
342 342
343static int __devinit ep93xx_gpio_probe(struct platform_device *pdev)343static int ep93xx_gpio_probe(struct platform_device *pdev)
344{344{
345 struct ep93xx_gpio *ep93xx_gpio;345 struct ep93xx_gpio *ep93xx_gpio;
346 struct resource *res;346 struct resource *res;
drivers/gpio/gpio-generic.c+3−3
@@ -444,7 +444,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev, · 443 unmodified lines
444 return ret;444 return ret;
445}445}
446 446
447static int __devinit bgpio_pdev_probe(struct platform_device *pdev)447static int bgpio_pdev_probe(struct platform_device *pdev)
448{448{
449 struct device *dev = &pdev->dev;449 struct device *dev = &pdev->dev;
450 struct resource *r;450 struct resource *r;
@@ -507,7 +507,7 @@ static int __devinit bgpio_pdev_probe(struct platform_device *pdev) · 56 unmodified lines
507 return gpiochip_add(&bgc->gc);507 return gpiochip_add(&bgc->gc);
508}508}
509 509
510static int __devexit bgpio_pdev_remove(struct platform_device *pdev)510static int bgpio_pdev_remove(struct platform_device *pdev)
511{511{
512 struct bgpio_chip *bgc = platform_get_drvdata(pdev);512 struct bgpio_chip *bgc = platform_get_drvdata(pdev);
513 513
@@ -527,7 +527,7 @@ static struct platform_driver bgpio_driver = { · 13 unmodified lines
527 },527 },
528 .id_table = bgpio_id_table,528 .id_table = bgpio_id_table,
529 .probe = bgpio_pdev_probe,529 .probe = bgpio_pdev_probe,
530 .remove = __devexit_p(bgpio_pdev_remove),530 .remove = bgpio_pdev_remove,
531};531};
532 532
533module_platform_driver(bgpio_driver);533module_platform_driver(bgpio_driver);
drivers/gpio/gpio-ich.c+5−5
@@ -238,7 +238,7 @@ static void ichx_gpio_set(struct gpio_chip *chip, unsigned nr, int val) · 237 unmodified lines
238 ichx_write_bit(GPIO_LVL, nr, val, 0);238 ichx_write_bit(GPIO_LVL, nr, val, 0);
239}239}
240 240
241static void __devinit ichx_gpiolib_setup(struct gpio_chip *chip)241static void ichx_gpiolib_setup(struct gpio_chip *chip)
242{242{
243 chip->owner = THIS_MODULE;243 chip->owner = THIS_MODULE;
244 chip->label = DRV_NAME;244 chip->label = DRV_NAME;
@@ -313,7 +313,7 @@ static struct ichx_desc intel5_desc = { · 68 unmodified lines
313 .ngpio = 76,313 .ngpio = 76,
314};314};
315 315
316static int __devinit ichx_gpio_request_regions(struct resource *res_base,316static int ichx_gpio_request_regions(struct resource *res_base,
317 const char *name, u8 use_gpio)317 const char *name, u8 use_gpio)
318{318{
319 int i;319 int i;
@@ -353,7 +353,7 @@ static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio) · 33 unmodified lines
353 }353 }
354}354}
355 355
356static int __devinit ichx_gpio_probe(struct platform_device *pdev)356static int ichx_gpio_probe(struct platform_device *pdev)
357{357{
358 struct resource *res_base, *res_pm;358 struct resource *res_base, *res_pm;
359 int err;359 int err;
@@ -442,7 +442,7 @@ add_err: · 82 unmodified lines
442 return err;442 return err;
443}443}
444 444
445static int __devexit ichx_gpio_remove(struct platform_device *pdev)445static int ichx_gpio_remove(struct platform_device *pdev)
446{446{
447 int err;447 int err;
448 448
@@ -467,7 +467,7 @@ static struct platform_driver ichx_gpio_driver = { · 18 unmodified lines
467 .name = DRV_NAME,467 .name = DRV_NAME,
468 },468 },
469 .probe = ichx_gpio_probe,469 .probe = ichx_gpio_probe,
470 .remove = __devexit_p(ichx_gpio_remove),470 .remove = ichx_gpio_remove,
471};471};
472 472
473module_platform_driver(ichx_gpio_driver);473module_platform_driver(ichx_gpio_driver);
drivers/gpio/gpio-janz-ttl.c+5−5
@@ -108,13 +108,13 @@ static void ttl_set_value(struct gpio_chip *gpio, unsigned offset, int value) · 107 unmodified lines
108 spin_unlock(&mod->lock);108 spin_unlock(&mod->lock);
109}109}
110 110
111static void __devinit ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)111static void ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
112{112{
113 iowrite16be(reg, &mod->regs->control);113 iowrite16be(reg, &mod->regs->control);
114 iowrite16be(val, &mod->regs->control);114 iowrite16be(val, &mod->regs->control);
115}115}
116 116
117static void __devinit ttl_setup_device(struct ttl_module *mod)117static void ttl_setup_device(struct ttl_module *mod)
118{118{
119 /* reset the device to a known state */119 /* reset the device to a known state */
120 iowrite16be(0x0000, &mod->regs->control);120 iowrite16be(0x0000, &mod->regs->control);
@@ -140,7 +140,7 @@ static void __devinit ttl_setup_device(struct ttl_module *mod) · 19 unmodified lines
140 ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);140 ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);
141}141}
142 142
143static int __devinit ttl_probe(struct platform_device *pdev)143static int ttl_probe(struct platform_device *pdev)
144{144{
145 struct janz_platform_data *pdata;145 struct janz_platform_data *pdata;
146 struct device *dev = &pdev->dev;146 struct device *dev = &pdev->dev;
@@ -211,7 +211,7 @@ out_return: · 64 unmodified lines
211 return ret;211 return ret;
212}212}
213 213
214static int __devexit ttl_remove(struct platform_device *pdev)214static int ttl_remove(struct platform_device *pdev)
215{215{
216 struct ttl_module *mod = platform_get_drvdata(pdev);216 struct ttl_module *mod = platform_get_drvdata(pdev);
217 struct device *dev = &pdev->dev;217 struct device *dev = &pdev->dev;
@@ -234,7 +234,7 @@ static struct platform_driver ttl_driver = { · 16 unmodified lines
234 .owner = THIS_MODULE,234 .owner = THIS_MODULE,
235 },235 },
236 .probe = ttl_probe,236 .probe = ttl_probe,
237 .remove = __devexit_p(ttl_remove),237 .remove = ttl_remove,
238};238};
239 239
240module_platform_driver(ttl_driver);240module_platform_driver(ttl_driver);
drivers/gpio/gpio-langwell.c+4−4
@@ -332,7 +332,7 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = { · 331 unmodified lines
332 .runtime_idle = lnw_gpio_runtime_idle,332 .runtime_idle = lnw_gpio_runtime_idle,
333};333};
334 334
335static int __devinit lnw_gpio_probe(struct pci_dev *pdev,335static int lnw_gpio_probe(struct pci_dev *pdev,
336 const struct pci_device_id *id)336 const struct pci_device_id *id)
337{337{
338 void *base;338 void *base;
@@ -435,7 +435,7 @@ static struct pci_driver lnw_gpio_driver = { · 96 unmodified lines
435};435};
436 436
437 437
438static int __devinit wp_gpio_probe(struct platform_device *pdev)438static int wp_gpio_probe(struct platform_device *pdev)
439{439{
440 struct lnw_gpio *lnw;440 struct lnw_gpio *lnw;
441 struct gpio_chip *gc;441 struct gpio_chip *gc;
@@ -484,7 +484,7 @@ err_kmalloc: · 42 unmodified lines
484 return retval;484 return retval;
485}485}
486 486
487static int __devexit wp_gpio_remove(struct platform_device *pdev)487static int wp_gpio_remove(struct platform_device *pdev)
488{488{
489 struct lnw_gpio *lnw = platform_get_drvdata(pdev);489 struct lnw_gpio *lnw = platform_get_drvdata(pdev);
490 int err;490 int err;
@@ -499,7 +499,7 @@ static int __devexit wp_gpio_remove(struct platform_device *pdev) · 8 unmodified lines
499 499
500static struct platform_driver wp_gpio_driver = {500static struct platform_driver wp_gpio_driver = {
501 .probe = wp_gpio_probe,501 .probe = wp_gpio_probe,
502 .remove = __devexit_p(wp_gpio_remove),502 .remove = wp_gpio_remove,
503 .driver = {503 .driver = {
504 .name = "wp_gpio",504 .name = "wp_gpio",
505 .owner = THIS_MODULE,505 .owner = THIS_MODULE,
drivers/gpio/gpio-lpc32xx.c+2−2
@@ -542,7 +542,7 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc, · 541 unmodified lines
542 return gpiospec->args[1];542 return gpiospec->args[1];
543}543}
544 544
545static int __devinit lpc32xx_gpio_probe(struct platform_device *pdev)545static int lpc32xx_gpio_probe(struct platform_device *pdev)
546{546{
547 int i;547 int i;
548 548
@@ -559,7 +559,7 @@ static int __devinit lpc32xx_gpio_probe(struct platform_device *pdev) · 10 unmodified lines
559}559}
560 560
561#ifdef CONFIG_OF561#ifdef CONFIG_OF
562static struct of_device_id lpc32xx_gpio_of_match[] __devinitdata = {562static struct of_device_id lpc32xx_gpio_of_match[] = {
563 { .compatible = "nxp,lpc3220-gpio", },563 { .compatible = "nxp,lpc3220-gpio", },
564 { },564 { },
565};565};
drivers/gpio/gpio-max7300.c+3−3
@@ -31,7 +31,7 @@ static int max7300_i2c_read(struct device *dev, unsigned int reg) · 30 unmodified lines
31 return i2c_smbus_read_byte_data(client, reg);31 return i2c_smbus_read_byte_data(client, reg);
32}32}
33 33
34static int __devinit max7300_probe(struct i2c_client *client,34static int max7300_probe(struct i2c_client *client,
35 const struct i2c_device_id *id)35 const struct i2c_device_id *id)
36{36{
37 struct max7301 *ts;37 struct max7301 *ts;
@@ -55,7 +55,7 @@ static int __devinit max7300_probe(struct i2c_client *client, · 17 unmodified lines
55 return ret;55 return ret;
56}56}
57 57
58static int __devexit max7300_remove(struct i2c_client *client)58static int max7300_remove(struct i2c_client *client)
59{59{
60 return __max730x_remove(&client->dev);60 return __max730x_remove(&client->dev);
61}61}
@@ -72,7 +72,7 @@ static struct i2c_driver max7300_driver = { · 10 unmodified lines
72 .owner = THIS_MODULE,72 .owner = THIS_MODULE,
73 },73 },
74 .probe = max7300_probe,74 .probe = max7300_probe,
75 .remove = __devexit_p(max7300_remove),75 .remove = max7300_remove,
76 .id_table = max7300_id,76 .id_table = max7300_id,
77};77};
78 78
drivers/gpio/gpio-max7301.c+3−3
@@ -50,7 +50,7 @@ static int max7301_spi_read(struct device *dev, unsigned int reg) · 49 unmodified lines
50 return word & 0xff;50 return word & 0xff;
51}51}
52 52
53static int __devinit max7301_probe(struct spi_device *spi)53static int max7301_probe(struct spi_device *spi)
54{54{
55 struct max7301 *ts;55 struct max7301 *ts;
56 int ret;56 int ret;
@@ -75,7 +75,7 @@ static int __devinit max7301_probe(struct spi_device *spi) · 18 unmodified lines
75 return ret;75 return ret;
76}76}
77 77
78static int __devexit max7301_remove(struct spi_device *spi)78static int max7301_remove(struct spi_device *spi)
79{79{
80 return __max730x_remove(&spi->dev);80 return __max730x_remove(&spi->dev);
81}81}
@@ -92,7 +92,7 @@ static struct spi_driver max7301_driver = { · 10 unmodified lines
92 .owner = THIS_MODULE,92 .owner = THIS_MODULE,
93 },93 },
94 .probe = max7301_probe,94 .probe = max7301_probe,
95 .remove = __devexit_p(max7301_remove),95 .remove = max7301_remove,
96 .id_table = max7301_id,96 .id_table = max7301_id,
97};97};
98 98
drivers/gpio/gpio-max730x.c+2−2
@@ -160,7 +160,7 @@ static void max7301_set(struct gpio_chip *chip, unsigned offset, int value) · 159 unmodified lines
160 mutex_unlock(&ts->lock);160 mutex_unlock(&ts->lock);
161}161}
162 162
163int __devinit __max730x_probe(struct max7301 *ts)163int __max730x_probe(struct max7301 *ts)
164{164{
165 struct device *dev = ts->dev;165 struct device *dev = ts->dev;
166 struct max7301_platform_data *pdata;166 struct max7301_platform_data *pdata;
@@ -226,7 +226,7 @@ exit_destroy: · 59 unmodified lines
226}226}
227EXPORT_SYMBOL_GPL(__max730x_probe);227EXPORT_SYMBOL_GPL(__max730x_probe);
228 228
229int __devexit __max730x_remove(struct device *dev)229int __max730x_remove(struct device *dev)
230{230{
231 struct max7301 *ts = dev_get_drvdata(dev);231 struct max7301 *ts = dev_get_drvdata(dev);
232 int ret;232 int ret;
drivers/gpio/gpio-max732x.c+4−4
@@ -526,7 +526,7 @@ static void max732x_irq_teardown(struct max732x_chip *chip) · 525 unmodified lines
526}526}
527#endif527#endif
528 528
529static int __devinit max732x_setup_gpio(struct max732x_chip *chip,529static int max732x_setup_gpio(struct max732x_chip *chip,
530 const struct i2c_device_id *id,530 const struct i2c_device_id *id,
531 unsigned gpio_start)531 unsigned gpio_start)
532{532{
@@ -574,7 +574,7 @@ static int __devinit max732x_setup_gpio(struct max732x_chip *chip, · 41 unmodified lines
574 return port;574 return port;
575}575}
576 576
577static int __devinit max732x_probe(struct i2c_client *client,577static int max732x_probe(struct i2c_client *client,
578 const struct i2c_device_id *id)578 const struct i2c_device_id *id)
579{579{
580 struct max732x_platform_data *pdata;580 struct max732x_platform_data *pdata;
@@ -651,7 +651,7 @@ out_failed: · 70 unmodified lines
651 return ret;651 return ret;
652}652}
653 653
654static int __devexit max732x_remove(struct i2c_client *client)654static int max732x_remove(struct i2c_client *client)
655{655{
656 struct max732x_platform_data *pdata = client->dev.platform_data;656 struct max732x_platform_data *pdata = client->dev.platform_data;
657 struct max732x_chip *chip = i2c_get_clientdata(client);657 struct max732x_chip *chip = i2c_get_clientdata(client);
@@ -690,7 +690,7 @@ static struct i2c_driver max732x_driver = { · 32 unmodified lines
690 .owner = THIS_MODULE,690 .owner = THIS_MODULE,
691 },691 },
692 .probe = max732x_probe,692 .probe = max732x_probe,
693 .remove = __devexit_p(max732x_remove),693 .remove = max732x_remove,
694 .id_table = max732x_id,694 .id_table = max732x_id,
695};695};
696 696
drivers/gpio/gpio-mc33880.c+3−3
@@ -80,7 +80,7 @@ static void mc33880_set(struct gpio_chip *chip, unsigned offset, int value) · 79 unmodified lines
80 mutex_unlock(&mc->lock);80 mutex_unlock(&mc->lock);
81}81}
82 82
83static int __devinit mc33880_probe(struct spi_device *spi)83static int mc33880_probe(struct spi_device *spi)
84{84{
85 struct mc33880 *mc;85 struct mc33880 *mc;
86 struct mc33880_platform_data *pdata;86 struct mc33880_platform_data *pdata;
@@ -147,7 +147,7 @@ exit_destroy: · 60 unmodified lines
147 return ret;147 return ret;
148}148}
149 149
150static int __devexit mc33880_remove(struct spi_device *spi)150static int mc33880_remove(struct spi_device *spi)
151{151{
152 struct mc33880 *mc;152 struct mc33880 *mc;
153 int ret;153 int ret;
@@ -175,7 +175,7 @@ static struct spi_driver mc33880_driver = { · 21 unmodified lines
175 .owner = THIS_MODULE,175 .owner = THIS_MODULE,
176 },176 },
177 .probe = mc33880_probe,177 .probe = mc33880_probe,
178 .remove = __devexit_p(mc33880_remove),178 .remove = mc33880_remove,
179};179};
180 180
181static int __init mc33880_init(void)181static int __init mc33880_init(void)
drivers/gpio/gpio-mcp23s08.c+3−3
@@ -475,7 +475,7 @@ fail: · 474 unmodified lines
475 475
476#if IS_ENABLED(CONFIG_I2C)476#if IS_ENABLED(CONFIG_I2C)
477 477
478static int __devinit mcp230xx_probe(struct i2c_client *client,478static int mcp230xx_probe(struct i2c_client *client,
479 const struct i2c_device_id *id)479 const struct i2c_device_id *id)
480{480{
481 struct mcp23s08_platform_data *pdata;481 struct mcp23s08_platform_data *pdata;
@@ -508,7 +508,7 @@ fail: · 26 unmodified lines
508 return status;508 return status;
509}509}
510 510
511static int __devexit mcp230xx_remove(struct i2c_client *client)511static int mcp230xx_remove(struct i2c_client *client)
512{512{
513 struct mcp23s08 *mcp = i2c_get_clientdata(client);513 struct mcp23s08 *mcp = i2c_get_clientdata(client);
514 int status;514 int status;
@@ -533,7 +533,7 @@ static struct i2c_driver mcp230xx_driver = { · 18 unmodified lines
533 .owner = THIS_MODULE,533 .owner = THIS_MODULE,
534 },534 },
535 .probe = mcp230xx_probe,535 .probe = mcp230xx_probe,
536 .remove = __devexit_p(mcp230xx_remove),536 .remove = mcp230xx_remove,
537 .id_table = mcp230xx_id,537 .id_table = mcp230xx_id,
538};538};
539 539
drivers/gpio/gpio-ml-ioh.c+4−4
@@ -385,7 +385,7 @@ static irqreturn_t ioh_gpio_handler(int irq, void *dev_id) · 384 unmodified lines
385 return ret;385 return ret;
386}386}
387 387
388static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,388static void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
389 unsigned int irq_start, unsigned int num)389 unsigned int irq_start, unsigned int num)
390{390{
391 struct irq_chip_generic *gc;391 struct irq_chip_generic *gc;
@@ -406,7 +406,7 @@ static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip, · 14 unmodified lines
406 IRQ_NOREQUEST | IRQ_NOPROBE, 0);406 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
407}407}
408 408
409static int __devinit ioh_gpio_probe(struct pci_dev *pdev,409static int ioh_gpio_probe(struct pci_dev *pdev,
410 const struct pci_device_id *id)410 const struct pci_device_id *id)
411{411{
412 int ret;412 int ret;
@@ -517,7 +517,7 @@ err_pci_enable: · 104 unmodified lines
517 return ret;517 return ret;
518}518}
519 519
520static void __devexit ioh_gpio_remove(struct pci_dev *pdev)520static void ioh_gpio_remove(struct pci_dev *pdev)
521{521{
522 int err;522 int err;
523 int i;523 int i;
@@ -606,7 +606,7 @@ static struct pci_driver ioh_gpio_driver = { · 82 unmodified lines
606 .name = "ml_ioh_gpio",606 .name = "ml_ioh_gpio",
607 .id_table = ioh_gpio_pcidev_id,607 .id_table = ioh_gpio_pcidev_id,
608 .probe = ioh_gpio_probe,608 .probe = ioh_gpio_probe,
609 .remove = __devexit_p(ioh_gpio_remove),609 .remove = ioh_gpio_remove,
610 .suspend = ioh_gpio_suspend,610 .suspend = ioh_gpio_suspend,
611 .resume = ioh_gpio_resume611 .resume = ioh_gpio_resume
612};612};
drivers/gpio/gpio-mpc5200.c+2−2
@@ -148,7 +148,7 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) · 147 unmodified lines
148 return 0;148 return 0;
149}149}
150 150
151static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)151static int mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
152{152{
153 struct mpc52xx_gpiochip *chip;153 struct mpc52xx_gpiochip *chip;
154 struct mpc52xx_gpio_wkup __iomem *regs;154 struct mpc52xx_gpio_wkup __iomem *regs;
@@ -308,7 +308,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) · 153 unmodified lines
308 return 0;308 return 0;
309}309}
310 310
311static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)311static int mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
312{312{
313 struct mpc52xx_gpiochip *chip;313 struct mpc52xx_gpiochip *chip;
314 struct gpio_chip *gc;314 struct gpio_chip *gc;
drivers/gpio/gpio-msic.c+1−1
@@ -256,7 +256,7 @@ static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc) · 255 unmodified lines
256 chip->irq_eoi(data);256 chip->irq_eoi(data);
257}257}
258 258
259static int __devinit platform_msic_gpio_probe(struct platform_device *pdev)259static int platform_msic_gpio_probe(struct platform_device *pdev)
260{260{
261 struct device *dev = &pdev->dev;261 struct device *dev = &pdev->dev;
262 struct intel_msic_gpio_pdata *pdata = dev->platform_data;262 struct intel_msic_gpio_pdata *pdata = dev->platform_data;
drivers/gpio/gpio-msm-v2.c+3−3
@@ -352,7 +352,7 @@ static struct irq_chip msm_gpio_irq_chip = { · 351 unmodified lines
352 .irq_set_wake = msm_gpio_irq_set_wake,352 .irq_set_wake = msm_gpio_irq_set_wake,
353};353};
354 354
355static int __devinit msm_gpio_probe(struct platform_device *dev)355static int msm_gpio_probe(struct platform_device *dev)
356{356{
357 int i, irq, ret;357 int i, irq, ret;
358 358
@@ -376,7 +376,7 @@ static int __devinit msm_gpio_probe(struct platform_device *dev) · 17 unmodified lines
376 return 0;376 return 0;
377}377}
378 378
379static int __devexit msm_gpio_remove(struct platform_device *dev)379static int msm_gpio_remove(struct platform_device *dev)
380{380{
381 int ret = gpiochip_remove(&msm_gpio.gpio_chip);381 int ret = gpiochip_remove(&msm_gpio.gpio_chip);
382 382
@@ -390,7 +390,7 @@ static int __devexit msm_gpio_remove(struct platform_device *dev) · 7 unmodified lines
390 390
391static struct platform_driver msm_gpio_driver = {391static struct platform_driver msm_gpio_driver = {
392 .probe = msm_gpio_probe,392 .probe = msm_gpio_probe,
393 .remove = __devexit_p(msm_gpio_remove),393 .remove = msm_gpio_remove,
394 .driver = {394 .driver = {
395 .name = "msmgpio",395 .name = "msmgpio",
396 .owner = THIS_MODULE,396 .owner = THIS_MODULE,
drivers/gpio/gpio-mvebu.c+2−2
@@ -482,7 +482,7 @@ static struct platform_device_id mvebu_gpio_ids[] = { · 481 unmodified lines
482};482};
483MODULE_DEVICE_TABLE(platform, mvebu_gpio_ids);483MODULE_DEVICE_TABLE(platform, mvebu_gpio_ids);
484 484
485static struct of_device_id mvebu_gpio_of_match[] __devinitdata = {485static struct of_device_id mvebu_gpio_of_match[] = {
486 {486 {
487 .compatible = "marvell,orion-gpio",487 .compatible = "marvell,orion-gpio",
488 .data = (void*) MVEBU_GPIO_SOC_VARIANT_ORION,488 .data = (void*) MVEBU_GPIO_SOC_VARIANT_ORION,
@@ -501,7 +501,7 @@ static struct of_device_id mvebu_gpio_of_match[] __devinitdata = { · 12 unmodified lines
501};501};
502MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match);502MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match);
503 503
504static int __devinit mvebu_gpio_probe(struct platform_device *pdev)504static int mvebu_gpio_probe(struct platform_device *pdev)
505{505{
506 struct mvebu_gpio_chip *mvchip;506 struct mvebu_gpio_chip *mvchip;
507 const struct of_device_id *match;507 const struct of_device_id *match;
drivers/gpio/gpio-mxc.c+2−2
@@ -356,7 +356,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base) · 355 unmodified lines
356 IRQ_NOREQUEST, 0);356 IRQ_NOREQUEST, 0);
357}357}
358 358
359static void __devinit mxc_gpio_get_hw(struct platform_device *pdev)359static void mxc_gpio_get_hw(struct platform_device *pdev)
360{360{
361 const struct of_device_id *of_id =361 const struct of_device_id *of_id =
362 of_match_device(mxc_gpio_dt_ids, &pdev->dev);362 of_match_device(mxc_gpio_dt_ids, &pdev->dev);
@@ -395,7 +395,7 @@ static int mxc_gpio_to_irq(struct gpio_chip *gc, unsigned offset) · 32 unmodified lines
395 return irq_find_mapping(port->domain, offset);395 return irq_find_mapping(port->domain, offset);
396}396}
397 397
398static int __devinit mxc_gpio_probe(struct platform_device *pdev)398static int mxc_gpio_probe(struct platform_device *pdev)
399{399{
400 struct device_node *np = pdev->dev.of_node;400 struct device_node *np = pdev->dev.of_node;
401 struct mxc_gpio_port *port;401 struct mxc_gpio_port *port;
drivers/gpio/gpio-mxs.c+1−1
@@ -214,7 +214,7 @@ static const struct of_device_id mxs_gpio_dt_ids[] = { · 213 unmodified lines
214};214};
215MODULE_DEVICE_TABLE(of, mxs_gpio_dt_ids);215MODULE_DEVICE_TABLE(of, mxs_gpio_dt_ids);
216 216
217static int __devinit mxs_gpio_probe(struct platform_device *pdev)217static int mxs_gpio_probe(struct platform_device *pdev)
218{218{
219 const struct of_device_id *of_id =219 const struct of_device_id *of_id =
220 of_match_device(mxs_gpio_dt_ids, &pdev->dev);220 of_match_device(mxs_gpio_dt_ids, &pdev->dev);
drivers/gpio/gpio-omap.c+3−3
@@ -1012,7 +1012,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) · 1011 unmodified lines
1012 dev_err(bank->dev, "Could not get gpio dbck\n");1012 dev_err(bank->dev, "Could not get gpio dbck\n");
1013}1013}
1014 1014
1015static __devinit void1015static void
1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
1017 unsigned int num)1017 unsigned int num)
1018{1018{
@@ -1041,7 +1041,7 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start, · 22 unmodified lines
1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0);1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
1042}1042}
1043 1043
1044static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)1044static void omap_gpio_chip_init(struct gpio_bank *bank)
1045{1045{
1046 int j;1046 int j;
1047 static int gpio;1047 static int gpio;
@@ -1089,7 +1089,7 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) · 41 unmodified lines
1089 1089
1090static const struct of_device_id omap_gpio_match[];1090static const struct of_device_id omap_gpio_match[];
1091 1091
1092static int __devinit omap_gpio_probe(struct platform_device *pdev)1092static int omap_gpio_probe(struct platform_device *pdev)
1093{1093{
1094 struct device *dev = &pdev->dev;1094 struct device *dev = &pdev->dev;
1095 struct device_node *node = dev->of_node;1095 struct device_node *node = dev->of_node;
drivers/gpio/gpio-pca953x.c+3−3
@@ -616,7 +616,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert) · 615 unmodified lines
616}616}
617#endif617#endif
618 618
619static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert)619static int device_pca953x_init(struct pca953x_chip *chip, u32 invert)
620{620{
621 int ret;621 int ret;
622 622
@@ -635,7 +635,7 @@ out: · 12 unmodified lines
635 return ret;635 return ret;
636}636}
637 637
638static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert)638static int device_pca957x_init(struct pca953x_chip *chip, u32 invert)
639{639{
640 int ret;640 int ret;
641 u32 val = 0;641 u32 val = 0;
@@ -666,7 +666,7 @@ out: · 24 unmodified lines
666 return ret;666 return ret;
667}667}
668 668
669static int __devinit pca953x_probe(struct i2c_client *client,669static int pca953x_probe(struct i2c_client *client,
670 const struct i2c_device_id *id)670 const struct i2c_device_id *id)
671{671{
672 struct pca953x_platform_data *pdata;672 struct pca953x_platform_data *pdata;
drivers/gpio/gpio-pch.c+4−4
@@ -326,7 +326,7 @@ static irqreturn_t pch_gpio_handler(int irq, void *dev_id) · 325 unmodified lines
326 return ret;326 return ret;
327}327}
328 328
329static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,329static void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
330 unsigned int irq_start, unsigned int num)330 unsigned int irq_start, unsigned int num)
331{331{
332 struct irq_chip_generic *gc;332 struct irq_chip_generic *gc;
@@ -346,7 +346,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip, · 13 unmodified lines
346 IRQ_NOREQUEST | IRQ_NOPROBE, 0);346 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
347}347}
348 348
349static int __devinit pch_gpio_probe(struct pci_dev *pdev,349static int pch_gpio_probe(struct pci_dev *pdev,
350 const struct pci_device_id *id)350 const struct pci_device_id *id)
351{351{
352 s32 ret;352 s32 ret;
@@ -443,7 +443,7 @@ err_pci_enable: · 90 unmodified lines
443 return ret;443 return ret;
444}444}
445 445
446static void __devexit pch_gpio_remove(struct pci_dev *pdev)446static void pch_gpio_remove(struct pci_dev *pdev)
447{447{
448 int err;448 int err;
449 struct pch_gpio *chip = pci_get_drvdata(pdev);449 struct pch_gpio *chip = pci_get_drvdata(pdev);
@@ -532,7 +532,7 @@ static struct pci_driver pch_gpio_driver = { · 82 unmodified lines
532 .name = "pch_gpio",532 .name = "pch_gpio",
533 .id_table = pch_gpio_pcidev_id,533 .id_table = pch_gpio_pcidev_id,
534 .probe = pch_gpio_probe,534 .probe = pch_gpio_probe,
535 .remove = __devexit_p(pch_gpio_remove),535 .remove = pch_gpio_remove,
536 .suspend = pch_gpio_suspend,536 .suspend = pch_gpio_suspend,
537 .resume = pch_gpio_resume537 .resume = pch_gpio_resume
538};538};
drivers/gpio/gpio-pxa.c+3−3
@@ -250,7 +250,7 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc, · 249 unmodified lines
250}250}
251#endif251#endif
252 252
253static int __devinit pxa_init_gpio_chip(int gpio_end,253static int pxa_init_gpio_chip(int gpio_end,
254 int (*set_wake)(unsigned int, unsigned int))254 int (*set_wake)(unsigned int, unsigned int))
255{255{
256 int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;256 int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;
@@ -490,7 +490,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = { · 233 unmodified lines
490 .xlate = irq_domain_xlate_twocell,490 .xlate = irq_domain_xlate_twocell,
491};491};
492 492
493static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)493static int pxa_gpio_probe_dt(struct platform_device *pdev)
494{494{
495 int ret, nr_banks, nr_gpios;495 int ret, nr_banks, nr_gpios;
496 struct device_node *prev, *next, *np = pdev->dev.of_node;496 struct device_node *prev, *next, *np = pdev->dev.of_node;
@@ -537,7 +537,7 @@ err: · 40 unmodified lines
537#define pxa_gpio_probe_dt(pdev) (-1)537#define pxa_gpio_probe_dt(pdev) (-1)
538#endif538#endif
539 539
540static int __devinit pxa_gpio_probe(struct platform_device *pdev)540static int pxa_gpio_probe(struct platform_device *pdev)
541{541{
542 struct pxa_gpio_chip *c;542 struct pxa_gpio_chip *c;
543 struct resource *res;543 struct resource *res;
drivers/gpio/gpio-rc5t583.c+3−3
@@ -111,7 +111,7 @@ static void rc5t583_gpio_free(struct gpio_chip *gc, unsigned offset) · 110 unmodified lines
111 rc5t583_set_bits(parent, RC5T583_GPIO_PGSEL, BIT(offset));111 rc5t583_set_bits(parent, RC5T583_GPIO_PGSEL, BIT(offset));
112}112}
113 113
114static int __devinit rc5t583_gpio_probe(struct platform_device *pdev)114static int rc5t583_gpio_probe(struct platform_device *pdev)
115{115{
116 struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);116 struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);
117 struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev);117 struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev);
@@ -146,7 +146,7 @@ static int __devinit rc5t583_gpio_probe(struct platform_device *pdev) · 28 unmodified lines
146 return gpiochip_add(&rc5t583_gpio->gpio_chip);146 return gpiochip_add(&rc5t583_gpio->gpio_chip);
147}147}
148 148
149static int __devexit rc5t583_gpio_remove(struct platform_device *pdev)149static int rc5t583_gpio_remove(struct platform_device *pdev)
150{150{
151 struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);151 struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
152 152
@@ -159,7 +159,7 @@ static struct platform_driver rc5t583_gpio_driver = { · 6 unmodified lines
159 .owner = THIS_MODULE,159 .owner = THIS_MODULE,
160 },160 },
161 .probe = rc5t583_gpio_probe,161 .probe = rc5t583_gpio_probe,
162 .remove = __devexit_p(rc5t583_gpio_remove),162 .remove = rc5t583_gpio_remove,
163};163};
164 164
165static int __init rc5t583_gpio_init(void)165static int __init rc5t583_gpio_init(void)
drivers/gpio/gpio-rdc321x.c+3−3
@@ -128,7 +128,7 @@ static int rdc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) · 127 unmodified lines
128/*128/*
129 * Cache the initial value of both GPIO data registers129 * Cache the initial value of both GPIO data registers
130 */130 */
131static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)131static int rdc321x_gpio_probe(struct platform_device *pdev)
132{132{
133 int err;133 int err;
134 struct resource *r;134 struct resource *r;
@@ -206,7 +206,7 @@ out_free: · 71 unmodified lines
206 return err;206 return err;
207}207}
208 208
209static int __devexit rdc321x_gpio_remove(struct platform_device *pdev)209static int rdc321x_gpio_remove(struct platform_device *pdev)
210{210{
211 int ret;211 int ret;
212 struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);212 struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
@@ -225,7 +225,7 @@ static struct platform_driver rdc321x_gpio_driver = { · 12 unmodified lines
225 .driver.name = "rdc321x-gpio",225 .driver.name = "rdc321x-gpio",
226 .driver.owner = THIS_MODULE,226 .driver.owner = THIS_MODULE,
227 .probe = rdc321x_gpio_probe,227 .probe = rdc321x_gpio_probe,
228 .remove = __devexit_p(rdc321x_gpio_remove),228 .remove = rdc321x_gpio_remove,
229};229};
230 230
231module_platform_driver(rdc321x_gpio_driver);231module_platform_driver(rdc321x_gpio_driver);
drivers/gpio/gpio-sch.c+3−3
@@ -185,7 +185,7 @@ static struct gpio_chip sch_gpio_resume = { · 184 unmodified lines
185 .set = sch_gpio_resume_set,185 .set = sch_gpio_resume_set,
186};186};
187 187
188static int __devinit sch_gpio_probe(struct platform_device *pdev)188static int sch_gpio_probe(struct platform_device *pdev)
189{189{
190 struct resource *res;190 struct resource *res;
191 int err, id;191 int err, id;
@@ -271,7 +271,7 @@ err_sch_gpio_core: · 79 unmodified lines
271 return err;271 return err;
272}272}
273 273
274static int __devexit sch_gpio_remove(struct platform_device *pdev)274static int sch_gpio_remove(struct platform_device *pdev)
275{275{
276 struct resource *res;276 struct resource *res;
277 if (gpio_ba) {277 if (gpio_ba) {
@@ -303,7 +303,7 @@ static struct platform_driver sch_gpio_driver = { · 25 unmodified lines
303 .owner = THIS_MODULE,303 .owner = THIS_MODULE,
304 },304 },
305 .probe = sch_gpio_probe,305 .probe = sch_gpio_probe,
306 .remove = __devexit_p(sch_gpio_remove),306 .remove = sch_gpio_remove,
307};307};
308 308
309module_platform_driver(sch_gpio_driver);309module_platform_driver(sch_gpio_driver);
drivers/gpio/gpio-sodaville.c+2−2
@@ -129,7 +129,7 @@ static struct irq_domain_ops irq_domain_sdv_ops = { · 128 unmodified lines
129 .xlate = sdv_xlate,129 .xlate = sdv_xlate,
130};130};
131 131
132static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,132static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
133 struct pci_dev *pdev)133 struct pci_dev *pdev)
134{134{
135 struct irq_chip_type *ct;135 struct irq_chip_type *ct;
@@ -186,7 +186,7 @@ out_free_desc: · 50 unmodified lines
186 return ret;186 return ret;
187}187}
188 188
189static int __devinit sdv_gpio_probe(struct pci_dev *pdev,189static int sdv_gpio_probe(struct pci_dev *pdev,
190 const struct pci_device_id *pci_id)190 const struct pci_device_id *pci_id)
191{191{
192 struct sdv_gpio_chip_data *sd;192 struct sdv_gpio_chip_data *sd;
drivers/gpio/gpio-sta2x11.c+2−2
@@ -320,7 +320,7 @@ static irqreturn_t gsta_gpio_handler(int irq, void *dev_id) · 319 unmodified lines
320 return ret;320 return ret;
321}321}
322 322
323static __devinit void gsta_alloc_irq_chip(struct gsta_gpio *chip)323static void gsta_alloc_irq_chip(struct gsta_gpio *chip)
324{324{
325 struct irq_chip_generic *gc;325 struct irq_chip_generic *gc;
326 struct irq_chip_type *ct;326 struct irq_chip_type *ct;
@@ -353,7 +353,7 @@ static __devinit void gsta_alloc_irq_chip(struct gsta_gpio *chip) · 26 unmodified lines
353}353}
354 354
355/* The platform device used here is instantiated by the MFD device */355/* The platform device used here is instantiated by the MFD device */
356static int __devinit gsta_probe(struct platform_device *dev)356static int gsta_probe(struct platform_device *dev)
357{357{
358 int i, err;358 int i, err;
359 struct pci_dev *pdev;359 struct pci_dev *pdev;
drivers/gpio/gpio-stmpe.c+4−4
@@ -307,7 +307,7 @@ static const struct irq_domain_ops stmpe_gpio_irq_simple_ops = { · 306 unmodified lines
307 .xlate = irq_domain_xlate_twocell,307 .xlate = irq_domain_xlate_twocell,
308};308};
309 309
310static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)310static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
311{311{
312 int base = stmpe_gpio->irq_base;312 int base = stmpe_gpio->irq_base;
313 313
@@ -322,7 +322,7 @@ static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio) · 8 unmodified lines
322 return 0;322 return 0;
323}323}
324 324
325static int __devinit stmpe_gpio_probe(struct platform_device *pdev)325static int stmpe_gpio_probe(struct platform_device *pdev)
326{326{
327 struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);327 struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
328 struct device_node *np = pdev->dev.of_node;328 struct device_node *np = pdev->dev.of_node;
@@ -401,7 +401,7 @@ out_free: · 72 unmodified lines
401 return ret;401 return ret;
402}402}
403 403
404static int __devexit stmpe_gpio_remove(struct platform_device *pdev)404static int stmpe_gpio_remove(struct platform_device *pdev)
405{405{
406 struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);406 struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);
407 struct stmpe *stmpe = stmpe_gpio->stmpe;407 struct stmpe *stmpe = stmpe_gpio->stmpe;
@@ -434,7 +434,7 @@ static struct platform_driver stmpe_gpio_driver = { · 26 unmodified lines
434 .driver.name = "stmpe-gpio",434 .driver.name = "stmpe-gpio",
435 .driver.owner = THIS_MODULE,435 .driver.owner = THIS_MODULE,
436 .probe = stmpe_gpio_probe,436 .probe = stmpe_gpio_probe,
437 .remove = __devexit_p(stmpe_gpio_remove),437 .remove = stmpe_gpio_remove,
438};438};
439 439
440static int __init stmpe_gpio_init(void)440static int __init stmpe_gpio_init(void)
drivers/gpio/gpio-stp-xway.c+1−1
@@ -197,7 +197,7 @@ static int xway_stp_hw_init(struct xway_stp *chip) · 196 unmodified lines
197 return 0;197 return 0;
198}198}
199 199
200static int __devinit xway_stp_probe(struct platform_device *pdev)200static int xway_stp_probe(struct platform_device *pdev)
201{201{
202 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);202 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
203 const __be32 *shadow, *groups, *dsl, *phy;203 const __be32 *shadow, *groups, *dsl, *phy;
drivers/gpio/gpio-sx150x.c+3−3
@@ -575,7 +575,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip) · 574 unmodified lines
575 }575 }
576}576}
577 577
578static int __devinit sx150x_probe(struct i2c_client *client,578static int sx150x_probe(struct i2c_client *client,
579 const struct i2c_device_id *id)579 const struct i2c_device_id *id)
580{580{
581 static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA |581 static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA |
@@ -622,7 +622,7 @@ probe_fail_pre_gpiochip_add: · 40 unmodified lines
622 return rc;622 return rc;
623}623}
624 624
625static int __devexit sx150x_remove(struct i2c_client *client)625static int sx150x_remove(struct i2c_client *client)
626{626{
627 struct sx150x_chip *chip;627 struct sx150x_chip *chip;
628 int rc;628 int rc;
@@ -646,7 +646,7 @@ static struct i2c_driver sx150x_driver = { · 17 unmodified lines
646 .owner = THIS_MODULE646 .owner = THIS_MODULE
647 },647 },
648 .probe = sx150x_probe,648 .probe = sx150x_probe,
649 .remove = __devexit_p(sx150x_remove),649 .remove = sx150x_remove,
650 .id_table = sx150x_id,650 .id_table = sx150x_id,
651};651};
652 652
drivers/gpio/gpio-tc3589x.c+3−3
@@ -309,7 +309,7 @@ static int tc3589x_gpio_irq_init(struct tc3589x_gpio *tc3589x_gpio, · 308 unmodified lines
309 return 0;309 return 0;
310}310}
311 311
312static int __devinit tc3589x_gpio_probe(struct platform_device *pdev)312static int tc3589x_gpio_probe(struct platform_device *pdev)
313{313{
314 struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);314 struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
315 struct tc3589x_gpio_platform_data *pdata;315 struct tc3589x_gpio_platform_data *pdata;
@@ -387,7 +387,7 @@ out_free: · 71 unmodified lines
387 return ret;387 return ret;
388}388}
389 389
390static int __devexit tc3589x_gpio_remove(struct platform_device *pdev)390static int tc3589x_gpio_remove(struct platform_device *pdev)
391{391{
392 struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);392 struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
393 struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;393 struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
@@ -417,7 +417,7 @@ static struct platform_driver tc3589x_gpio_driver = { · 23 unmodified lines
417 .driver.name = "tc3589x-gpio",417 .driver.name = "tc3589x-gpio",
418 .driver.owner = THIS_MODULE,418 .driver.owner = THIS_MODULE,
419 .probe = tc3589x_gpio_probe,419 .probe = tc3589x_gpio_probe,
420 .remove = __devexit_p(tc3589x_gpio_remove),420 .remove = tc3589x_gpio_remove,
421};421};
422 422
423static int __init tc3589x_gpio_init(void)423static int __init tc3589x_gpio_init(void)
drivers/gpio/gpio-tegra.c+2−2
@@ -375,7 +375,7 @@ static struct tegra_gpio_soc_config tegra30_gpio_config = { · 374 unmodified lines
375 .upper_offset = 0x80,375 .upper_offset = 0x80,
376};376};
377 377
378static struct of_device_id tegra_gpio_of_match[] __devinitdata = {378static struct of_device_id tegra_gpio_of_match[] = {
379 { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config },379 { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config },
380 { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config },380 { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config },
381 { },381 { },
@@ -386,7 +386,7 @@ static struct of_device_id tegra_gpio_of_match[] __devinitdata = { · 4 unmodified lines
386 */386 */
387static struct lock_class_key gpio_lock_class;387static struct lock_class_key gpio_lock_class;
388 388
389static int __devinit tegra_gpio_probe(struct platform_device *pdev)389static int tegra_gpio_probe(struct platform_device *pdev)
390{390{
391 const struct of_device_id *match;391 const struct of_device_id *match;
392 struct tegra_gpio_soc_config *config;392 struct tegra_gpio_soc_config *config;
drivers/gpio/gpio-timberdale.c+2−2
@@ -222,7 +222,7 @@ static struct irq_chip timbgpio_irqchip = { · 221 unmodified lines
222 .irq_set_type = timbgpio_irq_type,222 .irq_set_type = timbgpio_irq_type,
223};223};
224 224
225static int __devinit timbgpio_probe(struct platform_device *pdev)225static int timbgpio_probe(struct platform_device *pdev)
226{226{
227 int err, i;227 int err, i;
228 struct gpio_chip *gc;228 struct gpio_chip *gc;
@@ -316,7 +316,7 @@ err_mem: · 87 unmodified lines
316 return err;316 return err;
317}317}
318 318
319static int __devexit timbgpio_remove(struct platform_device *pdev)319static int timbgpio_remove(struct platform_device *pdev)
320{320{
321 int err;321 int err;
322 struct timbgpio_platform_data *pdata = pdev->dev.platform_data;322 struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
drivers/gpio/gpio-tps6586x.c+3−3
@@ -80,7 +80,7 @@ static int tps6586x_gpio_output(struct gpio_chip *gc, unsigned offset, · 79 unmodified lines
80 val, mask);80 val, mask);
81}81}
82 82
83static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)83static int tps6586x_gpio_probe(struct platform_device *pdev)
84{84{
85 struct tps6586x_platform_data *pdata;85 struct tps6586x_platform_data *pdata;
86 struct tps6586x_gpio *tps6586x_gpio;86 struct tps6586x_gpio *tps6586x_gpio;
@@ -126,7 +126,7 @@ static int __devinit tps6586x_gpio_probe(struct platform_device *pdev) · 39 unmodified lines
126 return ret;126 return ret;
127}127}
128 128
129static int __devexit tps6586x_gpio_remove(struct platform_device *pdev)129static int tps6586x_gpio_remove(struct platform_device *pdev)
130{130{
131 struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);131 struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
132 132
@@ -137,7 +137,7 @@ static struct platform_driver tps6586x_gpio_driver = { · 4 unmodified lines
137 .driver.name = "tps6586x-gpio",137 .driver.name = "tps6586x-gpio",
138 .driver.owner = THIS_MODULE,138 .driver.owner = THIS_MODULE,
139 .probe = tps6586x_gpio_probe,139 .probe = tps6586x_gpio_probe,
140 .remove = __devexit_p(tps6586x_gpio_remove),140 .remove = tps6586x_gpio_remove,
141};141};
142 142
143static int __init tps6586x_gpio_init(void)143static int __init tps6586x_gpio_init(void)
drivers/gpio/gpio-tps65910.c+3−3
@@ -113,7 +113,7 @@ static struct tps65910_board *tps65910_parse_dt_for_gpio(struct device *dev, · 112 unmodified lines
113}113}
114#endif114#endif
115 115
116static int __devinit tps65910_gpio_probe(struct platform_device *pdev)116static int tps65910_gpio_probe(struct platform_device *pdev)
117{117{
118 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);118 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
119 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);119 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);
@@ -188,7 +188,7 @@ skip_init: · 68 unmodified lines
188 return ret;188 return ret;
189}189}
190 190
191static int __devexit tps65910_gpio_remove(struct platform_device *pdev)191static int tps65910_gpio_remove(struct platform_device *pdev)
192{192{
193 struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);193 struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);
194 194
@@ -199,7 +199,7 @@ static struct platform_driver tps65910_gpio_driver = { · 4 unmodified lines
199 .driver.name = "tps65910-gpio",199 .driver.name = "tps65910-gpio",
200 .driver.owner = THIS_MODULE,200 .driver.owner = THIS_MODULE,
201 .probe = tps65910_gpio_probe,201 .probe = tps65910_gpio_probe,
202 .remove = __devexit_p(tps65910_gpio_remove),202 .remove = tps65910_gpio_remove,
203};203};
204 204
205static int __init tps65910_gpio_init(void)205static int __init tps65910_gpio_init(void)
drivers/gpio/gpio-tps65912.c+3−3
@@ -84,7 +84,7 @@ static struct gpio_chip template_chip = { · 83 unmodified lines
84 .base = -1,84 .base = -1,
85};85};
86 86
87static int __devinit tps65912_gpio_probe(struct platform_device *pdev)87static int tps65912_gpio_probe(struct platform_device *pdev)
88{88{
89 struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);89 struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
90 struct tps65912_board *pdata = tps65912->dev->platform_data;90 struct tps65912_board *pdata = tps65912->dev->platform_data;
@@ -113,7 +113,7 @@ static int __devinit tps65912_gpio_probe(struct platform_device *pdev) · 22 unmodified lines
113 return ret;113 return ret;
114}114}
115 115
116static int __devexit tps65912_gpio_remove(struct platform_device *pdev)116static int tps65912_gpio_remove(struct platform_device *pdev)
117{117{
118 struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev);118 struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev);
119 119
@@ -126,7 +126,7 @@ static struct platform_driver tps65912_gpio_driver = { · 6 unmodified lines
126 .owner = THIS_MODULE,126 .owner = THIS_MODULE,
127 },127 },
128 .probe = tps65912_gpio_probe,128 .probe = tps65912_gpio_probe,
129 .remove = __devexit_p(tps65912_gpio_remove),129 .remove = tps65912_gpio_remove,
130};130};
131 131
132static int __init tps65912_gpio_init(void)132static int __init tps65912_gpio_init(void)
drivers/gpio/gpio-twl4030.c+4−4
@@ -353,7 +353,7 @@ static struct gpio_chip twl_gpiochip = { · 352 unmodified lines
353 353
354/*----------------------------------------------------------------------*/354/*----------------------------------------------------------------------*/
355 355
356static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs)356static int gpio_twl4030_pulls(u32 ups, u32 downs)
357{357{
358 u8 message[6];358 u8 message[6];
359 unsigned i, gpio_bit;359 unsigned i, gpio_bit;
@@ -378,7 +378,7 @@ static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs) · 18 unmodified lines
378 REG_GPIOPUPDCTR1, 5);378 REG_GPIOPUPDCTR1, 5);
379}379}
380 380
381static int __devinit gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)381static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
382{382{
383 u8 message[4];383 u8 message[4];
384 384
@@ -420,7 +420,7 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev) · 35 unmodified lines
420 return omap_twl_info;420 return omap_twl_info;
421}421}
422 422
423static int __devinit gpio_twl4030_probe(struct platform_device *pdev)423static int gpio_twl4030_probe(struct platform_device *pdev)
424{424{
425 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;425 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
426 struct device_node *node = pdev->dev.of_node;426 struct device_node *node = pdev->dev.of_node;
@@ -506,7 +506,7 @@ out: · 79 unmodified lines
506 return ret;506 return ret;
507}507}
508 508
509/* Cannot use __devexit as gpio_twl4030_probe() calls us */509/* Cannot use as gpio_twl4030_probe() calls us */
510static int gpio_twl4030_remove(struct platform_device *pdev)510static int gpio_twl4030_remove(struct platform_device *pdev)
511{511{
512 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;512 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
drivers/gpio/gpio-twl6040.c+2−2
@@ -82,7 +82,7 @@ static struct gpio_chip twl6040gpo_chip = { · 81 unmodified lines
82 82
83/*----------------------------------------------------------------------*/83/*----------------------------------------------------------------------*/
84 84
85static int __devinit gpo_twl6040_probe(struct platform_device *pdev)85static int gpo_twl6040_probe(struct platform_device *pdev)
86{86{
87 struct twl6040_gpo_data *pdata = pdev->dev.platform_data;87 struct twl6040_gpo_data *pdata = pdev->dev.platform_data;
88 struct device *twl6040_core_dev = pdev->dev.parent;88 struct device *twl6040_core_dev = pdev->dev.parent;
@@ -113,7 +113,7 @@ static int __devinit gpo_twl6040_probe(struct platform_device *pdev) · 24 unmodified lines
113 return ret;113 return ret;
114}114}
115 115
116static int __devexit gpo_twl6040_remove(struct platform_device *pdev)116static int gpo_twl6040_remove(struct platform_device *pdev)
117{117{
118 return gpiochip_remove(&twl6040gpo_chip);118 return gpiochip_remove(&twl6040gpo_chip);
119}119}
drivers/gpio/gpio-vr41xx.c+3−3
@@ -490,7 +490,7 @@ static struct gpio_chip vr41xx_gpio_chip = { · 489 unmodified lines
490 .to_irq = vr41xx_gpio_to_irq,490 .to_irq = vr41xx_gpio_to_irq,
491};491};
492 492
493static int __devinit giu_probe(struct platform_device *pdev)493static int giu_probe(struct platform_device *pdev)
494{494{
495 struct resource *res;495 struct resource *res;
496 unsigned int trigger, i, pin;496 unsigned int trigger, i, pin;
@@ -552,7 +552,7 @@ static int __devinit giu_probe(struct platform_device *pdev) · 55 unmodified lines
552 return cascade_irq(irq, giu_get_irq);552 return cascade_irq(irq, giu_get_irq);
553}553}
554 554
555static int __devexit giu_remove(struct platform_device *pdev)555static int giu_remove(struct platform_device *pdev)
556{556{
557 if (giu_base) {557 if (giu_base) {
558 iounmap(giu_base);558 iounmap(giu_base);
@@ -564,7 +564,7 @@ static int __devexit giu_remove(struct platform_device *pdev) · 5 unmodified lines
564 564
565static struct platform_driver giu_device_driver = {565static struct platform_driver giu_device_driver = {
566 .probe = giu_probe,566 .probe = giu_probe,
567 .remove = __devexit_p(giu_remove),567 .remove = giu_remove,
568 .driver = {568 .driver = {
569 .name = "GIU",569 .name = "GIU",
570 .owner = THIS_MODULE,570 .owner = THIS_MODULE,
drivers/gpio/gpio-vt8500.c+1−1
@@ -271,7 +271,7 @@ static struct of_device_id vt8500_gpio_dt_ids[] = { · 270 unmodified lines
271 { /* Sentinel */ },271 { /* Sentinel */ },
272};272};
273 273
274static int __devinit vt8500_gpio_probe(struct platform_device *pdev)274static int vt8500_gpio_probe(struct platform_device *pdev)
275{275{
276 void __iomem *gpio_base;276 void __iomem *gpio_base;
277 struct device_node *np;277 struct device_node *np;
drivers/gpio/gpio-vx855.c+3−3
@@ -219,7 +219,7 @@ static void vx855gpio_gpio_setup(struct vx855_gpio *vg) · 218 unmodified lines
219}219}
220 220
221/* This platform device is ordinarily registered by the vx855 mfd driver */221/* This platform device is ordinarily registered by the vx855 mfd driver */
222static __devinit int vx855gpio_probe(struct platform_device *pdev)222static int vx855gpio_probe(struct platform_device *pdev)
223{223{
224 struct resource *res_gpi;224 struct resource *res_gpi;
225 struct resource *res_gpo;225 struct resource *res_gpo;
@@ -284,7 +284,7 @@ out_release: · 58 unmodified lines
284 return ret;284 return ret;
285}285}
286 286
287static int __devexit vx855gpio_remove(struct platform_device *pdev)287static int vx855gpio_remove(struct platform_device *pdev)
288{288{
289 struct vx855_gpio *vg = platform_get_drvdata(pdev);289 struct vx855_gpio *vg = platform_get_drvdata(pdev);
290 struct resource *res;290 struct resource *res;
@@ -312,7 +312,7 @@ static struct platform_driver vx855gpio_driver = { · 21 unmodified lines
312 .owner = THIS_MODULE,312 .owner = THIS_MODULE,
313 },313 },
314 .probe = vx855gpio_probe,314 .probe = vx855gpio_probe,
315 .remove = __devexit_p(vx855gpio_remove),315 .remove = vx855gpio_remove,
316};316};
317 317
318module_platform_driver(vx855gpio_driver);318module_platform_driver(vx855gpio_driver);
drivers/gpio/gpio-wm831x.c+3−3
@@ -243,7 +243,7 @@ static struct gpio_chip template_chip = { · 242 unmodified lines
243 .can_sleep = 1,243 .can_sleep = 1,
244};244};
245 245
246static int __devinit wm831x_gpio_probe(struct platform_device *pdev)246static int wm831x_gpio_probe(struct platform_device *pdev)
247{247{
248 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);248 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
249 struct wm831x_pdata *pdata = wm831x->dev->platform_data;249 struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@ -275,7 +275,7 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev) · 25 unmodified lines
275 return ret;275 return ret;
276}276}
277 277
278static int __devexit wm831x_gpio_remove(struct platform_device *pdev)278static int wm831x_gpio_remove(struct platform_device *pdev)
279{279{
280 struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);280 struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
281 281
@@ -286,7 +286,7 @@ static struct platform_driver wm831x_gpio_driver = { · 4 unmodified lines
286 .driver.name = "wm831x-gpio",286 .driver.name = "wm831x-gpio",
287 .driver.owner = THIS_MODULE,287 .driver.owner = THIS_MODULE,
288 .probe = wm831x_gpio_probe,288 .probe = wm831x_gpio_probe,
289 .remove = __devexit_p(wm831x_gpio_remove),289 .remove = wm831x_gpio_remove,
290};290};
291 291
292static int __init wm831x_gpio_init(void)292static int __init wm831x_gpio_init(void)
drivers/gpio/gpio-wm8350.c+3−3
@@ -109,7 +109,7 @@ static struct gpio_chip template_chip = { · 108 unmodified lines
109 .can_sleep = 1,109 .can_sleep = 1,
110};110};
111 111
112static int __devinit wm8350_gpio_probe(struct platform_device *pdev)112static int wm8350_gpio_probe(struct platform_device *pdev)
113{113{
114 struct wm8350 *wm8350 = dev_get_drvdata(pdev->dev.parent);114 struct wm8350 *wm8350 = dev_get_drvdata(pdev->dev.parent);
115 struct wm8350_platform_data *pdata = wm8350->dev->platform_data;115 struct wm8350_platform_data *pdata = wm8350->dev->platform_data;
@@ -141,7 +141,7 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev) · 25 unmodified lines
141 return ret;141 return ret;
142}142}
143 143
144static int __devexit wm8350_gpio_remove(struct platform_device *pdev)144static int wm8350_gpio_remove(struct platform_device *pdev)
145{145{
146 struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);146 struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
147 147
@@ -152,7 +152,7 @@ static struct platform_driver wm8350_gpio_driver = { · 4 unmodified lines
152 .driver.name = "wm8350-gpio",152 .driver.name = "wm8350-gpio",
153 .driver.owner = THIS_MODULE,153 .driver.owner = THIS_MODULE,
154 .probe = wm8350_gpio_probe,154 .probe = wm8350_gpio_probe,
155 .remove = __devexit_p(wm8350_gpio_remove),155 .remove = wm8350_gpio_remove,
156};156};
157 157
158static int __init wm8350_gpio_init(void)158static int __init wm8350_gpio_init(void)
drivers/gpio/gpio-wm8994.c+3−3
@@ -245,7 +245,7 @@ static struct gpio_chip template_chip = { · 244 unmodified lines
245 .can_sleep = 1,245 .can_sleep = 1,
246};246};
247 247
248static int __devinit wm8994_gpio_probe(struct platform_device *pdev)248static int wm8994_gpio_probe(struct platform_device *pdev)
249{249{
250 struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);250 struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
251 struct wm8994_pdata *pdata = wm8994->dev->platform_data;251 struct wm8994_pdata *pdata = wm8994->dev->platform_data;
@@ -281,7 +281,7 @@ err: · 29 unmodified lines
281 return ret;281 return ret;
282}282}
283 283
284static int __devexit wm8994_gpio_remove(struct platform_device *pdev)284static int wm8994_gpio_remove(struct platform_device *pdev)
285{285{
286 struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);286 struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
287 287
@@ -292,7 +292,7 @@ static struct platform_driver wm8994_gpio_driver = { · 4 unmodified lines
292 .driver.name = "wm8994-gpio",292 .driver.name = "wm8994-gpio",
293 .driver.owner = THIS_MODULE,293 .driver.owner = THIS_MODULE,
294 .probe = wm8994_gpio_probe,294 .probe = wm8994_gpio_probe,
295 .remove = __devexit_p(wm8994_gpio_remove),295 .remove = wm8994_gpio_remove,
296};296};
297 297
298static int __init wm8994_gpio_init(void)298static int __init wm8994_gpio_init(void)
drivers/gpio/gpio-xilinx.c+2−2
@@ -159,7 +159,7 @@ static void xgpio_save_regs(struct of_mm_gpio_chip *mm_gc) · 158 unmodified lines
159 * driver data structure. It returns 0, if the driver is bound to the GPIO159 * driver data structure. It returns 0, if the driver is bound to the GPIO
160 * device, or a negative value if there is an error.160 * device, or a negative value if there is an error.
161 */161 */
162static int __devinit xgpio_of_probe(struct device_node *np)162static int xgpio_of_probe(struct device_node *np)
163{163{
164 struct xgpio_instance *chip;164 struct xgpio_instance *chip;
165 int status = 0;165 int status = 0;
@@ -209,7 +209,7 @@ static int __devinit xgpio_of_probe(struct device_node *np) · 43 unmodified lines
209 return 0;209 return 0;
210}210}
211 211
212static struct of_device_id xgpio_of_match[] __devinitdata = {212static struct of_device_id xgpio_of_match[] = {
213 { .compatible = "xlnx,xps-gpio-1.00.a", },213 { .compatible = "xlnx,xps-gpio-1.00.a", },
214 { /* end of list */ },214 { /* end of list */ },
215};215};
drivers/hwmon/abituguru.c+6−6
@@ -478,7 +478,7 @@ static int abituguru_write(struct abituguru_data *data, · 477 unmodified lines
478 * alarm for sensor type X and then enabling the sensor as sensor type478 * alarm for sensor type X and then enabling the sensor as sensor type
479 * X, if we then get an alarm it is a sensor of type X.479 * X, if we then get an alarm it is a sensor of type X.
480 */480 */
481static int __devinit481static int
482abituguru_detect_bank1_sensor_type(struct abituguru_data *data,482abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
483 u8 sensor_addr)483 u8 sensor_addr)
484{484{
@@ -635,7 +635,7 @@ abituguru_detect_bank1_sensor_type_exit: · 150 unmodified lines
635 * read/write test would be feasible because of the reaction above, I've635 * read/write test would be feasible because of the reaction above, I've
636 * however opted to stay on the safe side.636 * however opted to stay on the safe side.
637 */637 */
638static void __devinit638static void
639abituguru_detect_no_bank2_sensors(struct abituguru_data *data)639abituguru_detect_no_bank2_sensors(struct abituguru_data *data)
640{640{
641 int i;641 int i;
@@ -691,7 +691,7 @@ abituguru_detect_no_bank2_sensors(struct abituguru_data *data) · 49 unmodified lines
691 (int)data->bank2_sensors);691 (int)data->bank2_sensors);
692}692}
693 693
694static void __devinit694static void
695abituguru_detect_no_pwms(struct abituguru_data *data)695abituguru_detect_no_pwms(struct abituguru_data *data)
696{696{
697 int i, j;697 int i, j;
@@ -1264,7 +1264,7 @@ static struct sensor_device_attribute_2 abituguru_sysfs_attr[] = { · 566 unmodified lines
1264 SENSOR_ATTR_2(name, 0444, show_name, NULL, 0, 0),1264 SENSOR_ATTR_2(name, 0444, show_name, NULL, 0, 0),
1265};1265};
1266 1266
1267static int __devinit abituguru_probe(struct platform_device *pdev)1267static int abituguru_probe(struct platform_device *pdev)
1268{1268{
1269 struct abituguru_data *data;1269 struct abituguru_data *data;
1270 int i, j, used, sysfs_names_free, sysfs_attr_i, res = -ENODEV;1270 int i, j, used, sysfs_names_free, sysfs_attr_i, res = -ENODEV;
@@ -1434,7 +1434,7 @@ abituguru_probe_error: · 163 unmodified lines
1434 return res;1434 return res;
1435}1435}
1436 1436
1437static int __devexit abituguru_remove(struct platform_device *pdev)1437static int abituguru_remove(struct platform_device *pdev)
1438{1438{
1439 int i;1439 int i;
1440 struct abituguru_data *data = platform_get_drvdata(pdev);1440 struct abituguru_data *data = platform_get_drvdata(pdev);
@@ -1545,7 +1545,7 @@ static struct platform_driver abituguru_driver = { · 104 unmodified lines
1545 .pm = ABIT_UGURU_PM,1545 .pm = ABIT_UGURU_PM,
1546 },1546 },
1547 .probe = abituguru_probe,1547 .probe = abituguru_probe,
1548 .remove = __devexit_p(abituguru_remove),1548 .remove = abituguru_remove,
1549};1549};
1550 1550
1551static int __init abituguru_detect(void)1551static int __init abituguru_detect(void)
drivers/hwmon/abituguru3.c+3−3
@@ -966,7 +966,7 @@ static struct sensor_device_attribute_2 abituguru3_sysfs_attr[] = { · 965 unmodified lines
966 SENSOR_ATTR_2(name, 0444, show_name, NULL, 0, 0),966 SENSOR_ATTR_2(name, 0444, show_name, NULL, 0, 0),
967};967};
968 968
969static int __devinit abituguru3_probe(struct platform_device *pdev)969static int abituguru3_probe(struct platform_device *pdev)
970{970{
971 const int no_sysfs_attr[3] = { 10, 8, 7 };971 const int no_sysfs_attr[3] = { 10, 8, 7 };
972 int sensor_index[3] = { 0, 1, 1 };972 int sensor_index[3] = { 0, 1, 1 };
@@ -1072,7 +1072,7 @@ abituguru3_probe_error: · 99 unmodified lines
1072 return res;1072 return res;
1073}1073}
1074 1074
1075static int __devexit abituguru3_remove(struct platform_device *pdev)1075static int abituguru3_remove(struct platform_device *pdev)
1076{1076{
1077 int i;1077 int i;
1078 struct abituguru3_data *data = platform_get_drvdata(pdev);1078 struct abituguru3_data *data = platform_get_drvdata(pdev);
@@ -1171,7 +1171,7 @@ static struct platform_driver abituguru3_driver = { · 92 unmodified lines
1171 .pm = ABIT_UGURU3_PM1171 .pm = ABIT_UGURU3_PM
1172 },1172 },
1173 .probe = abituguru3_probe,1173 .probe = abituguru3_probe,
1174 .remove = __devexit_p(abituguru3_remove),1174 .remove = abituguru3_remove,
1175};1175};
1176 1176
1177static int __init abituguru3_dmi_detect(void)1177static int __init abituguru3_dmi_detect(void)
drivers/hwmon/ad7314.c+3−3
@@ -107,7 +107,7 @@ static const struct attribute_group ad7314_group = { · 106 unmodified lines
107 .attrs = ad7314_attributes,107 .attrs = ad7314_attributes,
108};108};
109 109
110static int __devinit ad7314_probe(struct spi_device *spi_dev)110static int ad7314_probe(struct spi_device *spi_dev)
111{111{
112 int ret;112 int ret;
113 struct ad7314_data *chip;113 struct ad7314_data *chip;
@@ -135,7 +135,7 @@ error_remove_group: · 21 unmodified lines
135 return ret;135 return ret;
136}136}
137 137
138static int __devexit ad7314_remove(struct spi_device *spi_dev)138static int ad7314_remove(struct spi_device *spi_dev)
139{139{
140 struct ad7314_data *chip = dev_get_drvdata(&spi_dev->dev);140 struct ad7314_data *chip = dev_get_drvdata(&spi_dev->dev);
141 141
@@ -159,7 +159,7 @@ static struct spi_driver ad7314_driver = { · 17 unmodified lines
159 .owner = THIS_MODULE,159 .owner = THIS_MODULE,
160 },160 },
161 .probe = ad7314_probe,161 .probe = ad7314_probe,
162 .remove = __devexit_p(ad7314_remove),162 .remove = ad7314_remove,
163 .id_table = ad7314_id,163 .id_table = ad7314_id,
164};164};
165 165
drivers/hwmon/ad7414.c+2−2
@@ -226,7 +226,7 @@ exit_remove: · 225 unmodified lines
226 return err;226 return err;
227}227}
228 228
229static int __devexit ad7414_remove(struct i2c_client *client)229static int ad7414_remove(struct i2c_client *client)
230{230{
231 struct ad7414_data *data = i2c_get_clientdata(client);231 struct ad7414_data *data = i2c_get_clientdata(client);
232 232
@@ -246,7 +246,7 @@ static struct i2c_driver ad7414_driver = { · 13 unmodified lines
246 .name = "ad7414",246 .name = "ad7414",
247 },247 },
248 .probe = ad7414_probe,248 .probe = ad7414_probe,
249 .remove = __devexit_p(ad7414_remove),249 .remove = ad7414_remove,
250 .id_table = ad7414_id,250 .id_table = ad7414_id,
251};251};
252 252
drivers/hwmon/adcxx.c+3−3
@@ -161,7 +161,7 @@ static struct sensor_device_attribute ad_input[] = { · 160 unmodified lines
161 161
162/*----------------------------------------------------------------------*/162/*----------------------------------------------------------------------*/
163 163
164static int __devinit adcxx_probe(struct spi_device *spi)164static int adcxx_probe(struct spi_device *spi)
165{165{
166 int channels = spi_get_device_id(spi)->driver_data;166 int channels = spi_get_device_id(spi)->driver_data;
167 struct adcxx *adc;167 struct adcxx *adc;
@@ -208,7 +208,7 @@ out_err: · 40 unmodified lines
208 return status;208 return status;
209}209}
210 210
211static int __devexit adcxx_remove(struct spi_device *spi)211static int adcxx_remove(struct spi_device *spi)
212{212{
213 struct adcxx *adc = spi_get_drvdata(spi);213 struct adcxx *adc = spi_get_drvdata(spi);
214 int i;214 int i;
@@ -240,7 +240,7 @@ static struct spi_driver adcxx_driver = { · 25 unmodified lines
240 },240 },
241 .id_table = adcxx_ids,241 .id_table = adcxx_ids,
242 .probe = adcxx_probe,242 .probe = adcxx_probe,
243 .remove = __devexit_p(adcxx_remove),243 .remove = adcxx_remove,
244};244};
245 245
246module_spi_driver(adcxx_driver);246module_spi_driver(adcxx_driver);
drivers/hwmon/ads7871.c+3−3
@@ -173,7 +173,7 @@ static const struct attribute_group ads7871_group = { · 172 unmodified lines
173 .attrs = ads7871_attributes,173 .attrs = ads7871_attributes,
174};174};
175 175
176static int __devinit ads7871_probe(struct spi_device *spi)176static int ads7871_probe(struct spi_device *spi)
177{177{
178 int ret, err;178 int ret, err;
179 uint8_t val;179 uint8_t val;
@@ -225,7 +225,7 @@ error_remove: · 45 unmodified lines
225 return err;225 return err;
226}226}
227 227
228static int __devexit ads7871_remove(struct spi_device *spi)228static int ads7871_remove(struct spi_device *spi)
229{229{
230 struct ads7871_data *pdata = spi_get_drvdata(spi);230 struct ads7871_data *pdata = spi_get_drvdata(spi);
231 231
@@ -241,7 +241,7 @@ static struct spi_driver ads7871_driver = { · 9 unmodified lines
241 },241 },
242 242
243 .probe = ads7871_probe,243 .probe = ads7871_probe,
244 .remove = __devexit_p(ads7871_remove),244 .remove = ads7871_remove,
245};245};
246 246
247module_spi_driver(ads7871_driver);247module_spi_driver(ads7871_driver);
drivers/hwmon/adt7411.c+3−3
@@ -276,7 +276,7 @@ static int adt7411_detect(struct i2c_client *client, · 275 unmodified lines
276 return 0;276 return 0;
277}277}
278 278
279static int __devinit adt7411_probe(struct i2c_client *client,279static int adt7411_probe(struct i2c_client *client,
280 const struct i2c_device_id *id)280 const struct i2c_device_id *id)
281{281{
282 struct adt7411_data *data;282 struct adt7411_data *data;
@@ -317,7 +317,7 @@ static int __devinit adt7411_probe(struct i2c_client *client, · 34 unmodified lines
317 return ret;317 return ret;
318}318}
319 319
320static int __devexit adt7411_remove(struct i2c_client *client)320static int adt7411_remove(struct i2c_client *client)
321{321{
322 struct adt7411_data *data = i2c_get_clientdata(client);322 struct adt7411_data *data = i2c_get_clientdata(client);
323 323
@@ -337,7 +337,7 @@ static struct i2c_driver adt7411_driver = { · 13 unmodified lines
337 .name = "adt7411",337 .name = "adt7411",
338 },338 },
339 .probe = adt7411_probe,339 .probe = adt7411_probe,
340 .remove = __devexit_p(adt7411_remove),340 .remove = adt7411_remove,
341 .id_table = adt7411_id,341 .id_table = adt7411_id,
342 .detect = adt7411_detect,342 .detect = adt7411_detect,
343 .address_list = normal_i2c,343 .address_list = normal_i2c,
drivers/hwmon/coretemp.c+4−4
@@ -356,7 +356,7 @@ static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id, · 355 unmodified lines
356 return adjust_tjmax(c, id, dev);356 return adjust_tjmax(c, id, dev);
357}357}
358 358
359static int __devinit create_name_attr(struct platform_data *pdata,359static int create_name_attr(struct platform_data *pdata,
360 struct device *dev)360 struct device *dev)
361{361{
362 sysfs_attr_init(&pdata->name_attr.attr);362 sysfs_attr_init(&pdata->name_attr.attr);
@@ -551,7 +551,7 @@ static void coretemp_remove_core(struct platform_data *pdata, · 188 unmodified lines
551 pdata->core_data[indx] = NULL;551 pdata->core_data[indx] = NULL;
552}552}
553 553
554static int __devinit coretemp_probe(struct platform_device *pdev)554static int coretemp_probe(struct platform_device *pdev)
555{555{
556 struct platform_data *pdata;556 struct platform_data *pdata;
557 int err;557 int err;
@@ -584,7 +584,7 @@ exit_free: · 26 unmodified lines
584 return err;584 return err;
585}585}
586 586
587static int __devexit coretemp_remove(struct platform_device *pdev)587static int coretemp_remove(struct platform_device *pdev)
588{588{
589 struct platform_data *pdata = platform_get_drvdata(pdev);589 struct platform_data *pdata = platform_get_drvdata(pdev);
590 int i;590 int i;
@@ -606,7 +606,7 @@ static struct platform_driver coretemp_driver = { · 15 unmodified lines
606 .name = DRVNAME,606 .name = DRVNAME,
607 },607 },
608 .probe = coretemp_probe,608 .probe = coretemp_probe,
609 .remove = __devexit_p(coretemp_remove),609 .remove = coretemp_remove,
610};610};
611 611
612static int __cpuinit coretemp_device_add(unsigned int cpu)612static int __cpuinit coretemp_device_add(unsigned int cpu)
drivers/hwmon/da9052-hwmon.c+3−3
@@ -270,7 +270,7 @@ static struct attribute *da9052_attr[] = { · 269 unmodified lines
270 270
271static const struct attribute_group da9052_attr_group = {.attrs = da9052_attr};271static const struct attribute_group da9052_attr_group = {.attrs = da9052_attr};
272 272
273static int __devinit da9052_hwmon_probe(struct platform_device *pdev)273static int da9052_hwmon_probe(struct platform_device *pdev)
274{274{
275 struct da9052_hwmon *hwmon;275 struct da9052_hwmon *hwmon;
276 int ret;276 int ret;
@@ -303,7 +303,7 @@ err_mem: · 26 unmodified lines
303 return ret;303 return ret;
304}304}
305 305
306static int __devexit da9052_hwmon_remove(struct platform_device *pdev)306static int da9052_hwmon_remove(struct platform_device *pdev)
307{307{
308 struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);308 struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);
309 309
@@ -315,7 +315,7 @@ static int __devexit da9052_hwmon_remove(struct platform_device *pdev) · 5 unmodified lines
315 315
316static struct platform_driver da9052_hwmon_driver = {316static struct platform_driver da9052_hwmon_driver = {
317 .probe = da9052_hwmon_probe,317 .probe = da9052_hwmon_probe,
318 .remove = __devexit_p(da9052_hwmon_remove),318 .remove = da9052_hwmon_remove,
319 .driver = {319 .driver = {
320 .name = "da9052-hwmon",320 .name = "da9052-hwmon",
321 .owner = THIS_MODULE,321 .owner = THIS_MODULE,
drivers/hwmon/dme1737.c+3−3
@@ -2630,7 +2630,7 @@ exit: · 2629 unmodified lines
2630 return err;2630 return err;
2631}2631}
2632 2632
2633static int __devinit dme1737_isa_probe(struct platform_device *pdev)2633static int dme1737_isa_probe(struct platform_device *pdev)
2634{2634{
2635 u8 company, device;2635 u8 company, device;
2636 struct resource *res;2636 struct resource *res;
@@ -2718,7 +2718,7 @@ exit_remove_files: · 81 unmodified lines
2718 return err;2718 return err;
2719}2719}
2720 2720
2721static int __devexit dme1737_isa_remove(struct platform_device *pdev)2721static int dme1737_isa_remove(struct platform_device *pdev)
2722{2722{
2723 struct dme1737_data *data = platform_get_drvdata(pdev);2723 struct dme1737_data *data = platform_get_drvdata(pdev);
2724 2724
@@ -2734,7 +2734,7 @@ static struct platform_driver dme1737_isa_driver = { · 9 unmodified lines
2734 .name = "dme1737",2734 .name = "dme1737",
2735 },2735 },
2736 .probe = dme1737_isa_probe,2736 .probe = dme1737_isa_probe,
2737 .remove = __devexit_p(dme1737_isa_remove),2737 .remove = dme1737_isa_remove,
2738};2738};
2739 2739
2740/* ---------------------------------------------------------------------2740/* ---------------------------------------------------------------------
drivers/hwmon/f71805f.c+4−4
@@ -1343,7 +1343,7 @@ static struct attribute *f71805f_attr_pwm[] = { · 1342 unmodified lines
1343 * Device registration and initialization1343 * Device registration and initialization
1344 */1344 */
1345 1345
1346static void __devinit f71805f_init_device(struct f71805f_data *data)1346static void f71805f_init_device(struct f71805f_data *data)
1347{1347{
1348 u8 reg;1348 u8 reg;
1349 int i;1349 int i;
@@ -1374,7 +1374,7 @@ static void __devinit f71805f_init_device(struct f71805f_data *data) · 24 unmodified lines
1374 }1374 }
1375}1375}
1376 1376
1377static int __devinit f71805f_probe(struct platform_device *pdev)1377static int f71805f_probe(struct platform_device *pdev)
1378{1378{
1379 struct f71805f_sio_data *sio_data = pdev->dev.platform_data;1379 struct f71805f_sio_data *sio_data = pdev->dev.platform_data;
1380 struct f71805f_data *data;1380 struct f71805f_data *data;
@@ -1490,7 +1490,7 @@ exit_remove_files: · 109 unmodified lines
1490 return err;1490 return err;
1491}1491}
1492 1492
1493static int __devexit f71805f_remove(struct platform_device *pdev)1493static int f71805f_remove(struct platform_device *pdev)
1494{1494{
1495 struct f71805f_data *data = platform_get_drvdata(pdev);1495 struct f71805f_data *data = platform_get_drvdata(pdev);
1496 int i;1496 int i;
@@ -1510,7 +1510,7 @@ static struct platform_driver f71805f_driver = { · 13 unmodified lines
1510 .name = DRVNAME,1510 .name = DRVNAME,
1511 },1511 },
1512 .probe = f71805f_probe,1512 .probe = f71805f_probe,
1513 .remove = __devexit_p(f71805f_remove),1513 .remove = f71805f_remove,
1514};1514};
1515 1515
1516static int __init f71805f_device_add(unsigned short address,1516static int __init f71805f_device_add(unsigned short address,
drivers/hwmon/f71882fg.c+4−4
@@ -364,7 +364,7 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev, · 363 unmodified lines
364static ssize_t show_name(struct device *dev, struct device_attribute *devattr,364static ssize_t show_name(struct device *dev, struct device_attribute *devattr,
365 char *buf);365 char *buf);
366 366
367static int __devinit f71882fg_probe(struct platform_device *pdev);367static int f71882fg_probe(struct platform_device *pdev);
368static int f71882fg_remove(struct platform_device *pdev);368static int f71882fg_remove(struct platform_device *pdev);
369 369
370static struct platform_driver f71882fg_driver = {370static struct platform_driver f71882fg_driver = {
@@ -2145,7 +2145,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute *devattr, · 1774 unmodified lines
2145 return sprintf(buf, "%s\n", f71882fg_names[data->type]);2145 return sprintf(buf, "%s\n", f71882fg_names[data->type]);
2146}2146}
2147 2147
2148static int __devinit f71882fg_create_sysfs_files(struct platform_device *pdev,2148static int f71882fg_create_sysfs_files(struct platform_device *pdev,
2149 struct sensor_device_attribute_2 *attr, int count)2149 struct sensor_device_attribute_2 *attr, int count)
2150{2150{
2151 int err, i;2151 int err, i;
@@ -2167,7 +2167,7 @@ static void f71882fg_remove_sysfs_files(struct platform_device *pdev, · 15 unmodified lines
2167 device_remove_file(&pdev->dev, &attr[i].dev_attr);2167 device_remove_file(&pdev->dev, &attr[i].dev_attr);
2168}2168}
2169 2169
2170static int __devinit f71882fg_create_fan_sysfs_files(2170static int f71882fg_create_fan_sysfs_files(
2171 struct platform_device *pdev, int idx)2171 struct platform_device *pdev, int idx)
2172{2172{
2173 struct f71882fg_data *data = platform_get_drvdata(pdev);2173 struct f71882fg_data *data = platform_get_drvdata(pdev);
@@ -2265,7 +2265,7 @@ static int __devinit f71882fg_create_fan_sysfs_files( · 91 unmodified lines
2265 return err;2265 return err;
2266}2266}
2267 2267
2268static int __devinit f71882fg_probe(struct platform_device *pdev)2268static int f71882fg_probe(struct platform_device *pdev)
2269{2269{
2270 struct f71882fg_data *data;2270 struct f71882fg_data *data;
2271 struct f71882fg_sio_data *sio_data = pdev->dev.platform_data;2271 struct f71882fg_sio_data *sio_data = pdev->dev.platform_data;
drivers/hwmon/fam15h_power.c+5−5
@@ -114,7 +114,7 @@ static const struct attribute_group fam15h_power_attr_group = { · 113 unmodified lines
114 .attrs = fam15h_power_attrs,114 .attrs = fam15h_power_attrs,
115};115};
116 116
117static bool __devinit fam15h_power_is_internal_node0(struct pci_dev *f4)117static bool fam15h_power_is_internal_node0(struct pci_dev *f4)
118{118{
119 u32 val;119 u32 val;
120 120
@@ -171,7 +171,7 @@ static int fam15h_power_resume(struct pci_dev *pdev) · 50 unmodified lines
171#define fam15h_power_resume NULL171#define fam15h_power_resume NULL
172#endif172#endif
173 173
174static void __devinit fam15h_power_init_data(struct pci_dev *f4,174static void fam15h_power_init_data(struct pci_dev *f4,
175 struct fam15h_power_data *data)175 struct fam15h_power_data *data)
176{176{
177 u32 val;177 u32 val;
@@ -197,7 +197,7 @@ static void __devinit fam15h_power_init_data(struct pci_dev *f4, · 19 unmodified lines
197 data->processor_pwr_watts = (tmp * 15625) >> 10;197 data->processor_pwr_watts = (tmp * 15625) >> 10;
198}198}
199 199
200static int __devinit fam15h_power_probe(struct pci_dev *pdev,200static int fam15h_power_probe(struct pci_dev *pdev,
201 const struct pci_device_id *id)201 const struct pci_device_id *id)
202{202{
203 struct fam15h_power_data *data;203 struct fam15h_power_data *data;
@@ -238,7 +238,7 @@ exit_remove_group: · 34 unmodified lines
238 return err;238 return err;
239}239}
240 240
241static void __devexit fam15h_power_remove(struct pci_dev *pdev)241static void fam15h_power_remove(struct pci_dev *pdev)
242{242{
243 struct device *dev;243 struct device *dev;
244 struct fam15h_power_data *data;244 struct fam15h_power_data *data;
@@ -260,7 +260,7 @@ static struct pci_driver fam15h_power_driver = { · 15 unmodified lines
260 .name = "fam15h_power",260 .name = "fam15h_power",
261 .id_table = fam15h_power_id_table,261 .id_table = fam15h_power_id_table,
262 .probe = fam15h_power_probe,262 .probe = fam15h_power_probe,
263 .remove = __devexit_p(fam15h_power_remove),263 .remove = fam15h_power_remove,
264 .resume = fam15h_power_resume,264 .resume = fam15h_power_resume,
265};265};
266 266
drivers/hwmon/gpio-fan.c+4−4
@@ -499,13 +499,13 @@ static int gpio_fan_get_of_pdata(struct device *dev, · 498 unmodified lines
499 return 0;499 return 0;
500}500}
501 501
502static struct of_device_id of_gpio_fan_match[] __devinitdata = {502static struct of_device_id of_gpio_fan_match[] = {
503 { .compatible = "gpio-fan", },503 { .compatible = "gpio-fan", },
504 {},504 {},
505};505};
506#endif /* CONFIG_OF_GPIO */506#endif /* CONFIG_OF_GPIO */
507 507
508static int __devinit gpio_fan_probe(struct platform_device *pdev)508static int gpio_fan_probe(struct platform_device *pdev)
509{509{
510 int err;510 int err;
511 struct gpio_fan_data *fan_data;511 struct gpio_fan_data *fan_data;
@@ -581,7 +581,7 @@ err_free_alarm: · 69 unmodified lines
581 return err;581 return err;
582}582}
583 583
584static int __devexit gpio_fan_remove(struct platform_device *pdev)584static int gpio_fan_remove(struct platform_device *pdev)
585{585{
586 struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);586 struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);
587 587
@@ -626,7 +626,7 @@ static SIMPLE_DEV_PM_OPS(gpio_fan_pm, gpio_fan_suspend, gpio_fan_resume); · 38 unmodified lines
626 626
627static struct platform_driver gpio_fan_driver = {627static struct platform_driver gpio_fan_driver = {
628 .probe = gpio_fan_probe,628 .probe = gpio_fan_probe,
629 .remove = __devexit_p(gpio_fan_remove),629 .remove = gpio_fan_remove,
630 .driver = {630 .driver = {
631 .name = "gpio-fan",631 .name = "gpio-fan",
632 .pm = GPIO_FAN_PM,632 .pm = GPIO_FAN_PM,
drivers/hwmon/hih6130.c+3−3
@@ -220,7 +220,7 @@ static const struct attribute_group hih6130_attr_group = { · 219 unmodified lines
220 * device's name.220 * device's name.
221 * Returns 0 on success.221 * Returns 0 on success.
222 */222 */
223static int __devinit hih6130_probe(struct i2c_client *client,223static int hih6130_probe(struct i2c_client *client,
224 const struct i2c_device_id *id)224 const struct i2c_device_id *id)
225{225{
226 struct hih6130 *hih6130;226 struct hih6130 *hih6130;
@@ -263,7 +263,7 @@ fail_remove_sysfs: · 36 unmodified lines
263 * hih6130_remove() - remove device263 * hih6130_remove() - remove device
264 * @client: I2C client device264 * @client: I2C client device
265 */265 */
266static int __devexit hih6130_remove(struct i2c_client *client)266static int hih6130_remove(struct i2c_client *client)
267{267{
268 struct hih6130 *hih6130 = i2c_get_clientdata(client);268 struct hih6130 *hih6130 = i2c_get_clientdata(client);
269 269
@@ -283,7 +283,7 @@ MODULE_DEVICE_TABLE(i2c, hih6130_id); · 13 unmodified lines
283static struct i2c_driver hih6130_driver = {283static struct i2c_driver hih6130_driver = {
284 .driver.name = "hih6130",284 .driver.name = "hih6130",
285 .probe = hih6130_probe,285 .probe = hih6130_probe,
286 .remove = __devexit_p(hih6130_remove),286 .remove = hih6130_remove,
287 .id_table = hih6130_id,287 .id_table = hih6130_id,
288};288};
289 289
drivers/hwmon/i5k_amb.c+9−9
@@ -260,7 +260,7 @@ static ssize_t show_label(struct device *dev, · 259 unmodified lines
260 attr->index & DIMM_MASK);260 attr->index & DIMM_MASK);
261}261}
262 262
263static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)263static int i5k_amb_hwmon_init(struct platform_device *pdev)
264{264{
265 int i, j, k, d = 0;265 int i, j, k, d = 0;
266 u16 c;266 u16 c;
@@ -406,7 +406,7 @@ exit_remove: · 139 unmodified lines
406 return res;406 return res;
407}407}
408 408
409static int __devinit i5k_amb_add(void)409static int i5k_amb_add(void)
410{410{
411 int res = -ENODEV;411 int res = -ENODEV;
412 412
@@ -425,7 +425,7 @@ err: · 12 unmodified lines
425 return res;425 return res;
426}426}
427 427
428static int __devinit i5k_find_amb_registers(struct i5k_amb_data *data,428static int i5k_find_amb_registers(struct i5k_amb_data *data,
429 unsigned long devid)429 unsigned long devid)
430{430{
431 struct pci_dev *pcidev;431 struct pci_dev *pcidev;
@@ -459,7 +459,7 @@ out: · 27 unmodified lines
459 return res;459 return res;
460}460}
461 461
462static int __devinit i5k_channel_probe(u16 *amb_present, unsigned long dev_id)462static int i5k_channel_probe(u16 *amb_present, unsigned long dev_id)
463{463{
464 struct pci_dev *pcidev;464 struct pci_dev *pcidev;
465 u16 val16;465 u16 val16;
@@ -488,14 +488,14 @@ out: · 22 unmodified lines
488static struct {488static struct {
489 unsigned long err;489 unsigned long err;
490 unsigned long fbd0;490 unsigned long fbd0;
491} chipset_ids[] __devinitdata = {491} chipset_ids[] = {
492 { PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },492 { PCI_DEVICE_ID_INTEL_5000_ERR, PCI_DEVICE_ID_INTEL_5000_FBD0 },
493 { PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },493 { PCI_DEVICE_ID_INTEL_5400_ERR, PCI_DEVICE_ID_INTEL_5400_FBD0 },
494 { 0, 0 }494 { 0, 0 }
495};495};
496 496
497#ifdef MODULE497#ifdef MODULE
498static struct pci_device_id i5k_amb_ids[] __devinitdata = {498static struct pci_device_id i5k_amb_ids[] = {
499 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },499 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
500 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },500 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
501 { 0, }501 { 0, }
@@ -503,7 +503,7 @@ static struct pci_device_id i5k_amb_ids[] __devinitdata = { · 1 unmodified line
503MODULE_DEVICE_TABLE(pci, i5k_amb_ids);503MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
504#endif504#endif
505 505
506static int __devinit i5k_amb_probe(struct platform_device *pdev)506static int i5k_amb_probe(struct platform_device *pdev)
507{507{
508 struct i5k_amb_data *data;508 struct i5k_amb_data *data;
509 struct resource *reso;509 struct resource *reso;
@@ -564,7 +564,7 @@ err: · 54 unmodified lines
564 return res;564 return res;
565}565}
566 566
567static int __devexit i5k_amb_remove(struct platform_device *pdev)567static int i5k_amb_remove(struct platform_device *pdev)
568{568{
569 int i;569 int i;
570 struct i5k_amb_data *data = platform_get_drvdata(pdev);570 struct i5k_amb_data *data = platform_get_drvdata(pdev);
@@ -587,7 +587,7 @@ static struct platform_driver i5k_amb_driver = { · 16 unmodified lines
587 .name = DRVNAME,587 .name = DRVNAME,
588 },588 },
589 .probe = i5k_amb_probe,589 .probe = i5k_amb_probe,
590 .remove = __devexit_p(i5k_amb_remove),590 .remove = i5k_amb_remove,
591};591};
592 592
593static int __init i5k_amb_init(void)593static int __init i5k_amb_init(void)
drivers/hwmon/it87.c+6−6
@@ -428,7 +428,7 @@ static inline int has_old_autopwm(const struct it87_data *data) · 427 unmodified lines
428}428}
429 429
430static int it87_probe(struct platform_device *pdev);430static int it87_probe(struct platform_device *pdev);
431static int __devexit it87_remove(struct platform_device *pdev);431static int it87_remove(struct platform_device *pdev);
432 432
433static int it87_read_value(struct it87_data *data, u8 reg);433static int it87_read_value(struct it87_data *data, u8 reg);
434static void it87_write_value(struct it87_data *data, u8 reg, u8 value);434static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
@@ -443,7 +443,7 @@ static struct platform_driver it87_driver = { · 8 unmodified lines
443 .name = DRVNAME,443 .name = DRVNAME,
444 },444 },
445 .probe = it87_probe,445 .probe = it87_probe,
446 .remove = __devexit_p(it87_remove),446 .remove = it87_remove,
447};447};
448 448
449static ssize_t show_in(struct device *dev, struct device_attribute *attr,449static ssize_t show_in(struct device *dev, struct device_attribute *attr,
@@ -1966,7 +1966,7 @@ static void it87_remove_files(struct device *dev) · 1516 unmodified lines
1966 sysfs_remove_group(&dev->kobj, &it87_group_label);1966 sysfs_remove_group(&dev->kobj, &it87_group_label);
1967}1967}
1968 1968
1969static int __devinit it87_probe(struct platform_device *pdev)1969static int it87_probe(struct platform_device *pdev)
1970{1970{
1971 struct it87_data *data;1971 struct it87_data *data;
1972 struct resource *res;1972 struct resource *res;
@@ -2158,7 +2158,7 @@ error: · 185 unmodified lines
2158 return err;2158 return err;
2159}2159}
2160 2160
2161static int __devexit it87_remove(struct platform_device *pdev)2161static int it87_remove(struct platform_device *pdev)
2162{2162{
2163 struct it87_data *data = platform_get_drvdata(pdev);2163 struct it87_data *data = platform_get_drvdata(pdev);
2164 2164
@@ -2191,7 +2191,7 @@ static void it87_write_value(struct it87_data *data, u8 reg, u8 value) · 26 unmodified lines
2191}2191}
2192 2192
2193/* Return 1 if and only if the PWM interface is safe to use */2193/* Return 1 if and only if the PWM interface is safe to use */
2194static int __devinit it87_check_pwm(struct device *dev)2194static int it87_check_pwm(struct device *dev)
2195{2195{
2196 struct it87_data *data = dev_get_drvdata(dev);2196 struct it87_data *data = dev_get_drvdata(dev);
2197 /*2197 /*
@@ -2248,7 +2248,7 @@ static int __devinit it87_check_pwm(struct device *dev) · 50 unmodified lines
2248}2248}
2249 2249
2250/* Called when we have found a new IT87. */2250/* Called when we have found a new IT87. */
2251static void __devinit it87_init_device(struct platform_device *pdev)2251static void it87_init_device(struct platform_device *pdev)
2252{2252{
2253 struct it87_sio_data *sio_data = pdev->dev.platform_data;2253 struct it87_sio_data *sio_data = pdev->dev.platform_data;
2254 struct it87_data *data = platform_get_drvdata(pdev);2254 struct it87_data *data = platform_get_drvdata(pdev);
drivers/hwmon/jz4740-hwmon.c+3−3
@@ -102,7 +102,7 @@ static const struct attribute_group jz4740_hwmon_attr_group = { · 101 unmodified lines
102 .attrs = jz4740_hwmon_attributes,102 .attrs = jz4740_hwmon_attributes,
103};103};
104 104
105static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)105static int jz4740_hwmon_probe(struct platform_device *pdev)
106{106{
107 int ret;107 int ret;
108 struct jz4740_hwmon *hwmon;108 struct jz4740_hwmon *hwmon;
@@ -172,7 +172,7 @@ err_remove_file: · 63 unmodified lines
172 return ret;172 return ret;
173}173}
174 174
175static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)175static int jz4740_hwmon_remove(struct platform_device *pdev)
176{176{
177 struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);177 struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);
178 178
@@ -184,7 +184,7 @@ static int __devexit jz4740_hwmon_remove(struct platform_device *pdev) · 5 unmodified lines
184 184
185static struct platform_driver jz4740_hwmon_driver = {185static struct platform_driver jz4740_hwmon_driver = {
186 .probe = jz4740_hwmon_probe,186 .probe = jz4740_hwmon_probe,
187 .remove = __devexit_p(jz4740_hwmon_remove),187 .remove = jz4740_hwmon_remove,
188 .driver = {188 .driver = {
189 .name = "jz4740-hwmon",189 .name = "jz4740-hwmon",
190 .owner = THIS_MODULE,190 .owner = THIS_MODULE,
drivers/hwmon/k10temp.c+4−4
@@ -95,7 +95,7 @@ static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL, 0); · 94 unmodified lines
95static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit, NULL, 1);95static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit, NULL, 1);
96static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);96static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
97 97
98static bool __devinit has_erratum_319(struct pci_dev *pdev)98static bool has_erratum_319(struct pci_dev *pdev)
99{99{
100 u32 pkg_type, reg_dram_cfg;100 u32 pkg_type, reg_dram_cfg;
101 101
@@ -129,7 +129,7 @@ static bool __devinit has_erratum_319(struct pci_dev *pdev) · 27 unmodified lines
129 (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask <= 2);129 (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask <= 2);
130}130}
131 131
132static int __devinit k10temp_probe(struct pci_dev *pdev,132static int k10temp_probe(struct pci_dev *pdev,
133 const struct pci_device_id *id)133 const struct pci_device_id *id)
134{134{
135 struct device *hwmon_dev;135 struct device *hwmon_dev;
@@ -192,7 +192,7 @@ exit: · 56 unmodified lines
192 return err;192 return err;
193}193}
194 194
195static void __devexit k10temp_remove(struct pci_dev *pdev)195static void k10temp_remove(struct pci_dev *pdev)
196{196{
197 hwmon_device_unregister(pci_get_drvdata(pdev));197 hwmon_device_unregister(pci_get_drvdata(pdev));
198 device_remove_file(&pdev->dev, &dev_attr_name);198 device_remove_file(&pdev->dev, &dev_attr_name);
@@ -219,7 +219,7 @@ static struct pci_driver k10temp_driver = { · 20 unmodified lines
219 .name = "k10temp",219 .name = "k10temp",
220 .id_table = k10temp_id_table,220 .id_table = k10temp_id_table,
221 .probe = k10temp_probe,221 .probe = k10temp_probe,
222 .remove = __devexit_p(k10temp_remove),222 .remove = k10temp_remove,
223};223};
224 224
225module_pci_driver(k10temp_driver);225module_pci_driver(k10temp_driver);
drivers/hwmon/k8temp.c+4−4
@@ -142,7 +142,7 @@ static DEFINE_PCI_DEVICE_TABLE(k8temp_ids) = { · 141 unmodified lines
142 142
143MODULE_DEVICE_TABLE(pci, k8temp_ids);143MODULE_DEVICE_TABLE(pci, k8temp_ids);
144 144
145static int __devinit is_rev_g_desktop(u8 model)145static int is_rev_g_desktop(u8 model)
146{146{
147 u32 brandidx;147 u32 brandidx;
148 148
@@ -173,7 +173,7 @@ static int __devinit is_rev_g_desktop(u8 model) · 24 unmodified lines
173 return 1;173 return 1;
174}174}
175 175
176static int __devinit k8temp_probe(struct pci_dev *pdev,176static int k8temp_probe(struct pci_dev *pdev,
177 const struct pci_device_id *id)177 const struct pci_device_id *id)
178{178{
179 int err;179 int err;
@@ -304,7 +304,7 @@ exit_remove: · 124 unmodified lines
304 return err;304 return err;
305}305}
306 306
307static void __devexit k8temp_remove(struct pci_dev *pdev)307static void k8temp_remove(struct pci_dev *pdev)
308{308{
309 struct k8temp_data *data = pci_get_drvdata(pdev);309 struct k8temp_data *data = pci_get_drvdata(pdev);
310 310
@@ -324,7 +324,7 @@ static struct pci_driver k8temp_driver = { · 13 unmodified lines
324 .name = "k8temp",324 .name = "k8temp",
325 .id_table = k8temp_ids,325 .id_table = k8temp_ids,
326 .probe = k8temp_probe,326 .probe = k8temp_probe,
327 .remove = __devexit_p(k8temp_remove),327 .remove = k8temp_remove,
328};328};
329 329
330module_pci_driver(k8temp_driver);330module_pci_driver(k8temp_driver);
drivers/hwmon/lm70.c+3−3
@@ -131,7 +131,7 @@ static DEVICE_ATTR(name, S_IRUGO, lm70_show_name, NULL); · 130 unmodified lines
131 131
132/*----------------------------------------------------------------------*/132/*----------------------------------------------------------------------*/
133 133
134static int __devinit lm70_probe(struct spi_device *spi)134static int lm70_probe(struct spi_device *spi)
135{135{
136 int chip = spi_get_device_id(spi)->driver_data;136 int chip = spi_get_device_id(spi)->driver_data;
137 struct lm70 *p_lm70;137 struct lm70 *p_lm70;
@@ -178,7 +178,7 @@ out_dev_create_temp_file_failed: · 40 unmodified lines
178 return status;178 return status;
179}179}
180 180
181static int __devexit lm70_remove(struct spi_device *spi)181static int lm70_remove(struct spi_device *spi)
182{182{
183 struct lm70 *p_lm70 = spi_get_drvdata(spi);183 struct lm70 *p_lm70 = spi_get_drvdata(spi);
184 184
@@ -207,7 +207,7 @@ static struct spi_driver lm70_driver = { · 22 unmodified lines
207 },207 },
208 .id_table = lm70_ids,208 .id_table = lm70_ids,
209 .probe = lm70_probe,209 .probe = lm70_probe,
210 .remove = __devexit_p(lm70_remove),210 .remove = lm70_remove,
211};211};
212 212
213module_spi_driver(lm70_driver);213module_spi_driver(lm70_driver);
drivers/hwmon/lm78.c+3−3
@@ -833,7 +833,7 @@ static struct lm78_data *lm78_update_device(struct device *dev) · 832 unmodified lines
833}833}
834 834
835#ifdef CONFIG_ISA835#ifdef CONFIG_ISA
836static int __devinit lm78_isa_probe(struct platform_device *pdev)836static int lm78_isa_probe(struct platform_device *pdev)
837{837{
838 int err;838 int err;
839 struct lm78_data *data;839 struct lm78_data *data;
@@ -886,7 +886,7 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev) · 46 unmodified lines
886 return err;886 return err;
887}887}
888 888
889static int __devexit lm78_isa_remove(struct platform_device *pdev)889static int lm78_isa_remove(struct platform_device *pdev)
890{890{
891 struct lm78_data *data = platform_get_drvdata(pdev);891 struct lm78_data *data = platform_get_drvdata(pdev);
892 892
@@ -903,7 +903,7 @@ static struct platform_driver lm78_isa_driver = { · 10 unmodified lines
903 .name = "lm78",903 .name = "lm78",
904 },904 },
905 .probe = lm78_isa_probe,905 .probe = lm78_isa_probe,
906 .remove = __devexit_p(lm78_isa_remove),906 .remove = lm78_isa_remove,
907};907};
908 908
909/* return 1 if a supported chip is found, 0 otherwise */909/* return 1 if a supported chip is found, 0 otherwise */
drivers/hwmon/max1111.c+4−4
@@ -157,7 +157,7 @@ static const struct attribute_group max1110_attr_group = { · 156 unmodified lines
157 .attrs = max1110_attributes,157 .attrs = max1110_attributes,
158};158};
159 159
160static int __devinit setup_transfer(struct max1111_data *data)160static int setup_transfer(struct max1111_data *data)
161{161{
162 struct spi_message *m;162 struct spi_message *m;
163 struct spi_transfer *x;163 struct spi_transfer *x;
@@ -179,7 +179,7 @@ static int __devinit setup_transfer(struct max1111_data *data) · 15 unmodified lines
179 return 0;179 return 0;
180}180}
181 181
182static int __devinit max1111_probe(struct spi_device *spi)182static int max1111_probe(struct spi_device *spi)
183{183{
184 enum chips chip = spi_get_device_id(spi)->driver_data;184 enum chips chip = spi_get_device_id(spi)->driver_data;
185 struct max1111_data *data;185 struct max1111_data *data;
@@ -256,7 +256,7 @@ err_remove: · 70 unmodified lines
256 return err;256 return err;
257}257}
258 258
259static int __devexit max1111_remove(struct spi_device *spi)259static int max1111_remove(struct spi_device *spi)
260{260{
261 struct max1111_data *data = spi_get_drvdata(spi);261 struct max1111_data *data = spi_get_drvdata(spi);
262 262
@@ -283,7 +283,7 @@ static struct spi_driver max1111_driver = { · 20 unmodified lines
283 },283 },
284 .id_table = max1111_ids,284 .id_table = max1111_ids,
285 .probe = max1111_probe,285 .probe = max1111_probe,
286 .remove = __devexit_p(max1111_remove),286 .remove = max1111_remove,
287};287};
288 288
289module_spi_driver(max1111_driver);289module_spi_driver(max1111_driver);
drivers/hwmon/max197.c+3−3
@@ -257,7 +257,7 @@ static const struct attribute_group max197_sysfs_group = { · 256 unmodified lines
257 },257 },
258};258};
259 259
260static int __devinit max197_probe(struct platform_device *pdev)260static int max197_probe(struct platform_device *pdev)
261{261{
262 int ch, ret;262 int ch, ret;
263 struct max197_data *data;263 struct max197_data *data;
@@ -316,7 +316,7 @@ error: · 52 unmodified lines
316 return ret;316 return ret;
317}317}
318 318
319static int __devexit max197_remove(struct platform_device *pdev)319static int max197_remove(struct platform_device *pdev)
320{320{
321 struct max197_data *data = platform_get_drvdata(pdev);321 struct max197_data *data = platform_get_drvdata(pdev);
322 322
@@ -339,7 +339,7 @@ static struct platform_driver max197_driver = { · 16 unmodified lines
339 .owner = THIS_MODULE,339 .owner = THIS_MODULE,
340 },340 },
341 .probe = max197_probe,341 .probe = max197_probe,
342 .remove = __devexit_p(max197_remove),342 .remove = max197_remove,
343 .id_table = max197_device_ids,343 .id_table = max197_device_ids,
344};344};
345module_platform_driver(max197_driver);345module_platform_driver(max197_driver);
drivers/hwmon/mc13783-adc.c+2−2
@@ -233,7 +233,7 @@ out_err_create_16chans: · 232 unmodified lines
233 return ret;233 return ret;
234}234}
235 235
236static int __devexit mc13783_adc_remove(struct platform_device *pdev)236static int mc13783_adc_remove(struct platform_device *pdev)
237{237{
238 struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);238 struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
239 kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;239 kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;
@@ -265,7 +265,7 @@ static const struct platform_device_id mc13783_adc_idtable[] = { · 25 unmodified lines
265MODULE_DEVICE_TABLE(platform, mc13783_adc_idtable);265MODULE_DEVICE_TABLE(platform, mc13783_adc_idtable);
266 266
267static struct platform_driver mc13783_adc_driver = {267static struct platform_driver mc13783_adc_driver = {
268 .remove = __devexit_p(mc13783_adc_remove),268 .remove = mc13783_adc_remove,
269 .driver = {269 .driver = {
270 .owner = THIS_MODULE,270 .owner = THIS_MODULE,
271 .name = DRIVER_NAME,271 .name = DRIVER_NAME,
drivers/hwmon/ntc_thermistor.c+3−3
@@ -309,7 +309,7 @@ static const struct attribute_group ntc_attr_group = { · 308 unmodified lines
309 .attrs = ntc_attributes,309 .attrs = ntc_attributes,
310};310};
311 311
312static int __devinit ntc_thermistor_probe(struct platform_device *pdev)312static int ntc_thermistor_probe(struct platform_device *pdev)
313{313{
314 struct ntc_data *data;314 struct ntc_data *data;
315 struct ntc_thermistor_platform_data *pdata = pdev->dev.platform_data;315 struct ntc_thermistor_platform_data *pdata = pdev->dev.platform_data;
@@ -393,7 +393,7 @@ err_after_sysfs: · 77 unmodified lines
393 return ret;393 return ret;
394}394}
395 395
396static int __devexit ntc_thermistor_remove(struct platform_device *pdev)396static int ntc_thermistor_remove(struct platform_device *pdev)
397{397{
398 struct ntc_data *data = platform_get_drvdata(pdev);398 struct ntc_data *data = platform_get_drvdata(pdev);
399 399
@@ -419,7 +419,7 @@ static struct platform_driver ntc_thermistor_driver = { · 19 unmodified lines
419 .owner = THIS_MODULE,419 .owner = THIS_MODULE,
420 },420 },
421 .probe = ntc_thermistor_probe,421 .probe = ntc_thermistor_probe,
422 .remove = __devexit_p(ntc_thermistor_remove),422 .remove = ntc_thermistor_remove,
423 .id_table = ntc_thermistor_id,423 .id_table = ntc_thermistor_id,
424};424};
425 425
drivers/hwmon/pc87360.c+4−4
@@ -228,7 +228,7 @@ struct pc87360_data { · 227 unmodified lines
228 */228 */
229 229
230static int pc87360_probe(struct platform_device *pdev);230static int pc87360_probe(struct platform_device *pdev);
231static int __devexit pc87360_remove(struct platform_device *pdev);231static int pc87360_remove(struct platform_device *pdev);
232 232
233static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,233static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
234 u8 reg);234 u8 reg);
@@ -248,7 +248,7 @@ static struct platform_driver pc87360_driver = { · 13 unmodified lines
248 .name = "pc87360",248 .name = "pc87360",
249 },249 },
250 .probe = pc87360_probe,250 .probe = pc87360_probe,
251 .remove = __devexit_p(pc87360_remove),251 .remove = pc87360_remove,
252};252};
253 253
254/*254/*
@@ -1221,7 +1221,7 @@ static void pc87360_remove_files(struct device *dev) · 966 unmodified lines
1221 sysfs_remove_group(&dev->kobj, &pc8736x_vin_group);1221 sysfs_remove_group(&dev->kobj, &pc8736x_vin_group);
1222}1222}
1223 1223
1224static int __devinit pc87360_probe(struct platform_device *pdev)1224static int pc87360_probe(struct platform_device *pdev)
1225{1225{
1226 int i;1226 int i;
1227 struct pc87360_data *data;1227 struct pc87360_data *data;
@@ -1375,7 +1375,7 @@ error: · 147 unmodified lines
1375 return err;1375 return err;
1376}1376}
1377 1377
1378static int __devexit pc87360_remove(struct platform_device *pdev)1378static int pc87360_remove(struct platform_device *pdev)
1379{1379{
1380 struct pc87360_data *data = platform_get_drvdata(pdev);1380 struct pc87360_data *data = platform_get_drvdata(pdev);
1381 1381
drivers/hwmon/pc87427.c+5−5
@@ -956,7 +956,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); · 955 unmodified lines
956 * Device detection, attach and detach956 * Device detection, attach and detach
957 */957 */
958 958
959static int __devinit pc87427_request_regions(struct platform_device *pdev,959static int pc87427_request_regions(struct platform_device *pdev,
960 int count)960 int count)
961{961{
962 struct resource *res;962 struct resource *res;
@@ -980,7 +980,7 @@ static int __devinit pc87427_request_regions(struct platform_device *pdev, · 17 unmodified lines
980 return 0;980 return 0;
981}981}
982 982
983static void __devinit pc87427_init_device(struct device *dev)983static void pc87427_init_device(struct device *dev)
984{984{
985 struct pc87427_sio_data *sio_data = dev->platform_data;985 struct pc87427_sio_data *sio_data = dev->platform_data;
986 struct pc87427_data *data = dev_get_drvdata(dev);986 struct pc87427_data *data = dev_get_drvdata(dev);
@@ -1072,7 +1072,7 @@ static void pc87427_remove_files(struct device *dev) · 85 unmodified lines
1072 }1072 }
1073}1073}
1074 1074
1075static int __devinit pc87427_probe(struct platform_device *pdev)1075static int pc87427_probe(struct platform_device *pdev)
1076{1076{
1077 struct pc87427_sio_data *sio_data = pdev->dev.platform_data;1077 struct pc87427_sio_data *sio_data = pdev->dev.platform_data;
1078 struct pc87427_data *data;1078 struct pc87427_data *data;
@@ -1141,7 +1141,7 @@ exit_remove_files: · 62 unmodified lines
1141 return err;1141 return err;
1142}1142}
1143 1143
1144static int __devexit pc87427_remove(struct platform_device *pdev)1144static int pc87427_remove(struct platform_device *pdev)
1145{1145{
1146 struct pc87427_data *data = platform_get_drvdata(pdev);1146 struct pc87427_data *data = platform_get_drvdata(pdev);
1147 1147
@@ -1158,7 +1158,7 @@ static struct platform_driver pc87427_driver = { · 10 unmodified lines
1158 .name = DRVNAME,1158 .name = DRVNAME,
1159 },1159 },
1160 .probe = pc87427_probe,1160 .probe = pc87427_probe,
1161 .remove = __devexit_p(pc87427_remove),1161 .remove = pc87427_remove,
1162};1162};
1163 1163
1164static int __init pc87427_device_add(const struct pc87427_sio_data *sio_data)1164static int __init pc87427_device_add(const struct pc87427_sio_data *sio_data)
drivers/hwmon/s3c-hwmon.c+3−3
@@ -275,7 +275,7 @@ static void s3c_hwmon_remove_attr(struct device *dev, · 274 unmodified lines
275 * s3c_hwmon_probe - device probe entry.275 * s3c_hwmon_probe - device probe entry.
276 * @dev: The device being probed.276 * @dev: The device being probed.
277*/277*/
278static int __devinit s3c_hwmon_probe(struct platform_device *dev)278static int s3c_hwmon_probe(struct platform_device *dev)
279{279{
280 struct s3c_hwmon_pdata *pdata = dev->dev.platform_data;280 struct s3c_hwmon_pdata *pdata = dev->dev.platform_data;
281 struct s3c_hwmon *hwmon;281 struct s3c_hwmon *hwmon;
@@ -364,7 +364,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev) · 82 unmodified lines
364 return ret;364 return ret;
365}365}
366 366
367static int __devexit s3c_hwmon_remove(struct platform_device *dev)367static int s3c_hwmon_remove(struct platform_device *dev)
368{368{
369 struct s3c_hwmon *hwmon = platform_get_drvdata(dev);369 struct s3c_hwmon *hwmon = platform_get_drvdata(dev);
370 int i;370 int i;
@@ -386,7 +386,7 @@ static struct platform_driver s3c_hwmon_driver = { · 15 unmodified lines
386 .owner = THIS_MODULE,386 .owner = THIS_MODULE,
387 },387 },
388 .probe = s3c_hwmon_probe,388 .probe = s3c_hwmon_probe,
389 .remove = __devexit_p(s3c_hwmon_remove),389 .remove = s3c_hwmon_remove,
390};390};
391 391
392module_platform_driver(s3c_hwmon_driver);392module_platform_driver(s3c_hwmon_driver);
drivers/hwmon/sch5627.c+2−2
@@ -153,7 +153,7 @@ abort: · 152 unmodified lines
153 return ret;153 return ret;
154}154}
155 155
156static int __devinit sch5627_read_limits(struct sch5627_data *data)156static int sch5627_read_limits(struct sch5627_data *data)
157{157{
158 int i, val;158 int i, val;
159 159
@@ -465,7 +465,7 @@ static int sch5627_remove(struct platform_device *pdev) · 305 unmodified lines
465 return 0;465 return 0;
466}466}
467 467
468static int __devinit sch5627_probe(struct platform_device *pdev)468static int sch5627_probe(struct platform_device *pdev)
469{469{
470 struct sch5627_data *data;470 struct sch5627_data *data;
471 int err, build_code, build_id, hwmon_rev, val;471 int err, build_code, build_id, hwmon_rev, val;
drivers/hwmon/sch5636.c+1−1
@@ -405,7 +405,7 @@ static int sch5636_remove(struct platform_device *pdev) · 404 unmodified lines
405 return 0;405 return 0;
406}406}
407 407
408static int __devinit sch5636_probe(struct platform_device *pdev)408static int sch5636_probe(struct platform_device *pdev)
409{409{
410 struct sch5636_data *data;410 struct sch5636_data *data;
411 int i, err, val, revision[2];411 int i, err, val, revision[2];
drivers/hwmon/sht15.c+3−3
@@ -884,7 +884,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb, · 883 unmodified lines
884 return NOTIFY_OK;884 return NOTIFY_OK;
885}885}
886 886
887static int __devinit sht15_probe(struct platform_device *pdev)887static int sht15_probe(struct platform_device *pdev)
888{888{
889 int ret;889 int ret;
890 struct sht15_data *data;890 struct sht15_data *data;
@@ -1002,7 +1002,7 @@ err_release_reg: · 111 unmodified lines
1002 return ret;1002 return ret;
1003}1003}
1004 1004
1005static int __devexit sht15_remove(struct platform_device *pdev)1005static int sht15_remove(struct platform_device *pdev)
1006{1006{
1007 struct sht15_data *data = platform_get_drvdata(pdev);1007 struct sht15_data *data = platform_get_drvdata(pdev);
1008 1008
@@ -1043,7 +1043,7 @@ static struct platform_driver sht15_driver = { · 34 unmodified lines
1043 .owner = THIS_MODULE,1043 .owner = THIS_MODULE,
1044 },1044 },
1045 .probe = sht15_probe,1045 .probe = sht15_probe,
1046 .remove = __devexit_p(sht15_remove),1046 .remove = sht15_remove,
1047 .id_table = sht15_device_ids,1047 .id_table = sht15_device_ids,
1048};1048};
1049module_platform_driver(sht15_driver);1049module_platform_driver(sht15_driver);
drivers/hwmon/sht21.c+3−3
@@ -187,7 +187,7 @@ static const struct attribute_group sht21_attr_group = { · 186 unmodified lines
187 * device's name.187 * device's name.
188 * Returns 0 on success.188 * Returns 0 on success.
189 */189 */
190static int __devinit sht21_probe(struct i2c_client *client,190static int sht21_probe(struct i2c_client *client,
191 const struct i2c_device_id *id)191 const struct i2c_device_id *id)
192{192{
193 struct sht21 *sht21;193 struct sht21 *sht21;
@@ -233,7 +233,7 @@ fail_remove_sysfs: · 39 unmodified lines
233 * sht21_remove() - remove device233 * sht21_remove() - remove device
234 * @client: I2C client device234 * @client: I2C client device
235 */235 */
236static int __devexit sht21_remove(struct i2c_client *client)236static int sht21_remove(struct i2c_client *client)
237{237{
238 struct sht21 *sht21 = i2c_get_clientdata(client);238 struct sht21 *sht21 = i2c_get_clientdata(client);
239 239
@@ -253,7 +253,7 @@ MODULE_DEVICE_TABLE(i2c, sht21_id); · 13 unmodified lines
253static struct i2c_driver sht21_driver = {253static struct i2c_driver sht21_driver = {
254 .driver.name = "sht21",254 .driver.name = "sht21",
255 .probe = sht21_probe,255 .probe = sht21_probe,
256 .remove = __devexit_p(sht21_remove),256 .remove = sht21_remove,
257 .id_table = sht21_id,257 .id_table = sht21_id,
258};258};
259 259
drivers/hwmon/sis5595.c+8−8
@@ -204,7 +204,7 @@ struct sis5595_data { · 203 unmodified lines
204static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */204static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */
205 205
206static int sis5595_probe(struct platform_device *pdev);206static int sis5595_probe(struct platform_device *pdev);
207static int __devexit sis5595_remove(struct platform_device *pdev);207static int sis5595_remove(struct platform_device *pdev);
208 208
209static int sis5595_read_value(struct sis5595_data *data, u8 reg);209static int sis5595_read_value(struct sis5595_data *data, u8 reg);
210static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);210static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);
@@ -217,7 +217,7 @@ static struct platform_driver sis5595_driver = { · 6 unmodified lines
217 .name = "sis5595",217 .name = "sis5595",
218 },218 },
219 .probe = sis5595_probe,219 .probe = sis5595_probe,
220 .remove = __devexit_p(sis5595_remove),220 .remove = sis5595_remove,
221};221};
222 222
223/* 4 Voltages */223/* 4 Voltages */
@@ -583,7 +583,7 @@ static const struct attribute_group sis5595_group_temp1 = { · 359 unmodified lines
583};583};
584 584
585/* This is called when the module is loaded */585/* This is called when the module is loaded */
586static int __devinit sis5595_probe(struct platform_device *pdev)586static int sis5595_probe(struct platform_device *pdev)
587{587{
588 int err = 0;588 int err = 0;
589 int i;589 int i;
@@ -659,7 +659,7 @@ exit_remove_files: · 69 unmodified lines
659 return err;659 return err;
660}660}
661 661
662static int __devexit sis5595_remove(struct platform_device *pdev)662static int sis5595_remove(struct platform_device *pdev)
663{663{
664 struct sis5595_data *data = platform_get_drvdata(pdev);664 struct sis5595_data *data = platform_get_drvdata(pdev);
665 665
@@ -693,7 +693,7 @@ static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value) · 27 unmodified lines
693}693}
694 694
695/* Called when we have found a new SIS5595. */695/* Called when we have found a new SIS5595. */
696static void __devinit sis5595_init_device(struct sis5595_data *data)696static void sis5595_init_device(struct sis5595_data *data)
697{697{
698 u8 config = sis5595_read_value(data, SIS5595_REG_CONFIG);698 u8 config = sis5595_read_value(data, SIS5595_REG_CONFIG);
699 if (!(config & 0x01))699 if (!(config & 0x01))
@@ -758,7 +758,7 @@ static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = { · 58 unmodified lines
758 758
759MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);759MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
760 760
761static int blacklist[] __devinitdata = {761static int blacklist[] = {
762 PCI_DEVICE_ID_SI_540,762 PCI_DEVICE_ID_SI_540,
763 PCI_DEVICE_ID_SI_550,763 PCI_DEVICE_ID_SI_550,
764 PCI_DEVICE_ID_SI_630,764 PCI_DEVICE_ID_SI_630,
@@ -774,7 +774,7 @@ static int blacklist[] __devinitdata = { · 9 unmodified lines
774 PCI_DEVICE_ID_SI_5598,774 PCI_DEVICE_ID_SI_5598,
775 0 };775 0 };
776 776
777static int __devinit sis5595_device_add(unsigned short address)777static int sis5595_device_add(unsigned short address)
778{778{
779 struct resource res = {779 struct resource res = {
780 .start = address,780 .start = address,
@@ -815,7 +815,7 @@ exit: · 34 unmodified lines
815 return err;815 return err;
816}816}
817 817
818static int __devinit sis5595_pci_probe(struct pci_dev *dev,818static int sis5595_pci_probe(struct pci_dev *dev,
819 const struct pci_device_id *id)819 const struct pci_device_id *id)
820{820{
821 u16 address;821 u16 address;
drivers/hwmon/smsc47b397.c+3−3
@@ -228,7 +228,7 @@ static const struct attribute_group smsc47b397_group = { · 227 unmodified lines
228 .attrs = smsc47b397_attributes,228 .attrs = smsc47b397_attributes,
229};229};
230 230
231static int __devexit smsc47b397_remove(struct platform_device *pdev)231static int smsc47b397_remove(struct platform_device *pdev)
232{232{
233 struct smsc47b397_data *data = platform_get_drvdata(pdev);233 struct smsc47b397_data *data = platform_get_drvdata(pdev);
234 234
@@ -246,10 +246,10 @@ static struct platform_driver smsc47b397_driver = { · 11 unmodified lines
246 .name = DRVNAME,246 .name = DRVNAME,
247 },247 },
248 .probe = smsc47b397_probe,248 .probe = smsc47b397_probe,
249 .remove = __devexit_p(smsc47b397_remove),249 .remove = smsc47b397_remove,
250};250};
251 251
252static int __devinit smsc47b397_probe(struct platform_device *pdev)252static int smsc47b397_probe(struct platform_device *pdev)
253{253{
254 struct device *dev = &pdev->dev;254 struct device *dev = &pdev->dev;
255 struct smsc47b397_data *data;255 struct smsc47b397_data *data;
drivers/hwmon/tmp102.c+3−3
@@ -147,7 +147,7 @@ static const struct attribute_group tmp102_attr_group = { · 146 unmodified lines
147#define TMP102_CONFIG (TMP102_CONF_TM | TMP102_CONF_EM | TMP102_CONF_CR1)147#define TMP102_CONFIG (TMP102_CONF_TM | TMP102_CONF_EM | TMP102_CONF_CR1)
148#define TMP102_CONFIG_RD_ONLY (TMP102_CONF_R0 | TMP102_CONF_R1 | TMP102_CONF_AL)148#define TMP102_CONFIG_RD_ONLY (TMP102_CONF_R0 | TMP102_CONF_R1 | TMP102_CONF_AL)
149 149
150static int __devinit tmp102_probe(struct i2c_client *client,150static int tmp102_probe(struct i2c_client *client,
151 const struct i2c_device_id *id)151 const struct i2c_device_id *id)
152{152{
153 struct tmp102 *tmp102;153 struct tmp102 *tmp102;
@@ -216,7 +216,7 @@ fail_restore_config: · 62 unmodified lines
216 return status;216 return status;
217}217}
218 218
219static int __devexit tmp102_remove(struct i2c_client *client)219static int tmp102_remove(struct i2c_client *client)
220{220{
221 struct tmp102 *tmp102 = i2c_get_clientdata(client);221 struct tmp102 *tmp102 = i2c_get_clientdata(client);
222 222
@@ -283,7 +283,7 @@ static struct i2c_driver tmp102_driver = { · 60 unmodified lines
283 .driver.name = DRIVER_NAME,283 .driver.name = DRIVER_NAME,
284 .driver.pm = TMP102_DEV_PM_OPS,284 .driver.pm = TMP102_DEV_PM_OPS,
285 .probe = tmp102_probe,285 .probe = tmp102_probe,
286 .remove = __devexit_p(tmp102_remove),286 .remove = tmp102_remove,
287 .id_table = tmp102_id,287 .id_table = tmp102_id,
288};288};
289 289
drivers/hwmon/twl4030-madc-hwmon.c+2−2
@@ -96,7 +96,7 @@ static const struct attribute_group twl4030_madc_group = { · 95 unmodified lines
96 .attrs = twl4030_madc_attributes,96 .attrs = twl4030_madc_attributes,
97};97};
98 98
99static int __devinit twl4030_madc_hwmon_probe(struct platform_device *pdev)99static int twl4030_madc_hwmon_probe(struct platform_device *pdev)
100{100{
101 int ret;101 int ret;
102 struct device *hwmon;102 struct device *hwmon;
@@ -120,7 +120,7 @@ err_sysfs: · 17 unmodified lines
120 return ret;120 return ret;
121}121}
122 122
123static int __devexit twl4030_madc_hwmon_remove(struct platform_device *pdev)123static int twl4030_madc_hwmon_remove(struct platform_device *pdev)
124{124{
125 hwmon_device_unregister(&pdev->dev);125 hwmon_device_unregister(&pdev->dev);
126 sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group);126 sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group);
drivers/hwmon/ultra45_env.c+3−3
@@ -250,7 +250,7 @@ static const struct attribute_group env_group = { · 249 unmodified lines
250 .attrs = env_attributes,250 .attrs = env_attributes,
251};251};
252 252
253static int __devinit env_probe(struct platform_device *op)253static int env_probe(struct platform_device *op)
254{254{
255 struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);255 struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);
256 int err = -ENOMEM;256 int err = -ENOMEM;
@@ -291,7 +291,7 @@ out_free: · 34 unmodified lines
291 goto out;291 goto out;
292}292}
293 293
294static int __devexit env_remove(struct platform_device *op)294static int env_remove(struct platform_device *op)
295{295{
296 struct env *p = platform_get_drvdata(op);296 struct env *p = platform_get_drvdata(op);
297 297
@@ -321,7 +321,7 @@ static struct platform_driver env_driver = { · 23 unmodified lines
321 .of_match_table = env_match,321 .of_match_table = env_match,
322 },322 },
323 .probe = env_probe,323 .probe = env_probe,
324 .remove = __devexit_p(env_remove),324 .remove = env_remove,
325};325};
326 326
327module_platform_driver(env_driver);327module_platform_driver(env_driver);
drivers/hwmon/via-cputemp.c+3−3
@@ -121,7 +121,7 @@ static const struct attribute_group via_cputemp_group = { · 120 unmodified lines
121/* Optional attributes */121/* Optional attributes */
122static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_cpu_vid, NULL);122static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_cpu_vid, NULL);
123 123
124static int __devinit via_cputemp_probe(struct platform_device *pdev)124static int via_cputemp_probe(struct platform_device *pdev)
125{125{
126 struct via_cputemp_data *data;126 struct via_cputemp_data *data;
127 struct cpuinfo_x86 *c = &cpu_data(pdev->id);127 struct cpuinfo_x86 *c = &cpu_data(pdev->id);
@@ -192,7 +192,7 @@ exit_remove: · 64 unmodified lines
192 return err;192 return err;
193}193}
194 194
195static int __devexit via_cputemp_remove(struct platform_device *pdev)195static int via_cputemp_remove(struct platform_device *pdev)
196{196{
197 struct via_cputemp_data *data = platform_get_drvdata(pdev);197 struct via_cputemp_data *data = platform_get_drvdata(pdev);
198 198
@@ -209,7 +209,7 @@ static struct platform_driver via_cputemp_driver = { · 10 unmodified lines
209 .name = DRVNAME,209 .name = DRVNAME,
210 },210 },
211 .probe = via_cputemp_probe,211 .probe = via_cputemp_probe,
212 .remove = __devexit_p(via_cputemp_remove),212 .remove = via_cputemp_remove,
213};213};
214 214
215struct pdev_entry {215struct pdev_entry {
drivers/hwmon/via686a.c+7−7
@@ -339,7 +339,7 @@ struct via686a_data { · 338 unmodified lines
339static struct pci_dev *s_bridge; /* pointer to the (only) via686a */339static struct pci_dev *s_bridge; /* pointer to the (only) via686a */
340 340
341static int via686a_probe(struct platform_device *pdev);341static int via686a_probe(struct platform_device *pdev);
342static int __devexit via686a_remove(struct platform_device *pdev);342static int via686a_remove(struct platform_device *pdev);
343 343
344static inline int via686a_read_value(struct via686a_data *data, u8 reg)344static inline int via686a_read_value(struct via686a_data *data, u8 reg)
345{345{
@@ -677,12 +677,12 @@ static struct platform_driver via686a_driver = { · 331 unmodified lines
677 .name = "via686a",677 .name = "via686a",
678 },678 },
679 .probe = via686a_probe,679 .probe = via686a_probe,
680 .remove = __devexit_p(via686a_remove),680 .remove = via686a_remove,
681};681};
682 682
683 683
684/* This is called when the module is loaded */684/* This is called when the module is loaded */
685static int __devinit via686a_probe(struct platform_device *pdev)685static int via686a_probe(struct platform_device *pdev)
686{686{
687 struct via686a_data *data;687 struct via686a_data *data;
688 struct resource *res;688 struct resource *res;
@@ -728,7 +728,7 @@ exit_remove_files: · 39 unmodified lines
728 return err;728 return err;
729}729}
730 730
731static int __devexit via686a_remove(struct platform_device *pdev)731static int via686a_remove(struct platform_device *pdev)
732{732{
733 struct via686a_data *data = platform_get_drvdata(pdev);733 struct via686a_data *data = platform_get_drvdata(pdev);
734 734
@@ -745,7 +745,7 @@ static void via686a_update_fan_div(struct via686a_data *data) · 10 unmodified lines
745 data->fan_div[1] = reg >> 6;745 data->fan_div[1] = reg >> 6;
746}746}
747 747
748static void __devinit via686a_init_device(struct via686a_data *data)748static void via686a_init_device(struct via686a_data *data)
749{749{
750 u8 reg;750 u8 reg;
751 751
@@ -833,7 +833,7 @@ static DEFINE_PCI_DEVICE_TABLE(via686a_pci_ids) = { · 81 unmodified lines
833};833};
834MODULE_DEVICE_TABLE(pci, via686a_pci_ids);834MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
835 835
836static int __devinit via686a_device_add(unsigned short address)836static int via686a_device_add(unsigned short address)
837{837{
838 struct resource res = {838 struct resource res = {
839 .start = address,839 .start = address,
@@ -874,7 +874,7 @@ exit: · 34 unmodified lines
874 return err;874 return err;
875}875}
876 876
877static int __devinit via686a_pci_probe(struct pci_dev *dev,877static int via686a_pci_probe(struct pci_dev *dev,
878 const struct pci_device_id *id)878 const struct pci_device_id *id)
879{879{
880 u16 address, val;880 u16 address, val;
drivers/hwmon/vt1211.c+4−4
@@ -1086,7 +1086,7 @@ static struct device_attribute vt1211_sysfs_misc[] = { · 1085 unmodified lines
1086 * Device registration and initialization1086 * Device registration and initialization
1087 * --------------------------------------------------------------------- */1087 * --------------------------------------------------------------------- */
1088 1088
1089static void __devinit vt1211_init_device(struct vt1211_data *data)1089static void vt1211_init_device(struct vt1211_data *data)
1090{1090{
1091 /* set VRM */1091 /* set VRM */
1092 data->vrm = vid_which_vrm();1092 data->vrm = vid_which_vrm();
@@ -1141,7 +1141,7 @@ static void vt1211_remove_sysfs(struct platform_device *pdev) · 48 unmodified lines
1141 device_remove_file(dev, &vt1211_sysfs_misc[i]);1141 device_remove_file(dev, &vt1211_sysfs_misc[i]);
1142}1142}
1143 1143
1144static int __devinit vt1211_probe(struct platform_device *pdev)1144static int vt1211_probe(struct platform_device *pdev)
1145{1145{
1146 struct device *dev = &pdev->dev;1146 struct device *dev = &pdev->dev;
1147 struct vt1211_data *data;1147 struct vt1211_data *data;
@@ -1217,7 +1217,7 @@ EXIT_DEV_REMOVE_SILENT: · 69 unmodified lines
1217 return err;1217 return err;
1218}1218}
1219 1219
1220static int __devexit vt1211_remove(struct platform_device *pdev)1220static int vt1211_remove(struct platform_device *pdev)
1221{1221{
1222 struct vt1211_data *data = platform_get_drvdata(pdev);1222 struct vt1211_data *data = platform_get_drvdata(pdev);
1223 1223
@@ -1233,7 +1233,7 @@ static struct platform_driver vt1211_driver = { · 9 unmodified lines
1233 .name = DRVNAME,1233 .name = DRVNAME,
1234 },1234 },
1235 .probe = vt1211_probe,1235 .probe = vt1211_probe,
1236 .remove = __devexit_p(vt1211_remove),1236 .remove = vt1211_remove,
1237};1237};
1238 1238
1239static int __init vt1211_device_add(unsigned short address)1239static int __init vt1211_device_add(unsigned short address)
drivers/hwmon/vt8231.c+6−6
@@ -176,7 +176,7 @@ struct vt8231_data { · 175 unmodified lines
176 176
177static struct pci_dev *s_bridge;177static struct pci_dev *s_bridge;
178static int vt8231_probe(struct platform_device *pdev);178static int vt8231_probe(struct platform_device *pdev);
179static int __devexit vt8231_remove(struct platform_device *pdev);179static int vt8231_remove(struct platform_device *pdev);
180static struct vt8231_data *vt8231_update_device(struct device *dev);180static struct vt8231_data *vt8231_update_device(struct device *dev);
181static void vt8231_init_device(struct vt8231_data *data);181static void vt8231_init_device(struct vt8231_data *data);
182 182
@@ -762,7 +762,7 @@ static struct platform_driver vt8231_driver = { · 579 unmodified lines
762 .name = "vt8231",762 .name = "vt8231",
763 },763 },
764 .probe = vt8231_probe,764 .probe = vt8231_probe,
765 .remove = __devexit_p(vt8231_remove),765 .remove = vt8231_remove,
766};766};
767 767
768static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = {768static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = {
@@ -772,7 +772,7 @@ static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = { · 3 unmodified lines
772 772
773MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);773MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
774 774
775static int __devinit vt8231_pci_probe(struct pci_dev *dev,775static int vt8231_pci_probe(struct pci_dev *dev,
776 const struct pci_device_id *id);776 const struct pci_device_id *id);
777 777
778static struct pci_driver vt8231_pci_driver = {778static struct pci_driver vt8231_pci_driver = {
@@ -851,7 +851,7 @@ exit_remove_files: · 72 unmodified lines
851 return err;851 return err;
852}852}
853 853
854static int __devexit vt8231_remove(struct platform_device *pdev)854static int vt8231_remove(struct platform_device *pdev)
855{855{
856 struct vt8231_data *data = platform_get_drvdata(pdev);856 struct vt8231_data *data = platform_get_drvdata(pdev);
857 int i;857 int i;
@@ -943,7 +943,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev) · 85 unmodified lines
943 return data;943 return data;
944}944}
945 945
946static int __devinit vt8231_device_add(unsigned short address)946static int vt8231_device_add(unsigned short address)
947{947{
948 struct resource res = {948 struct resource res = {
949 .start = address,949 .start = address,
@@ -984,7 +984,7 @@ exit: · 34 unmodified lines
984 return err;984 return err;
985}985}
986 986
987static int __devinit vt8231_pci_probe(struct pci_dev *dev,987static int vt8231_pci_probe(struct pci_dev *dev,
988 const struct pci_device_id *id)988 const struct pci_device_id *id)
989{989{
990 u16 address, val;990 u16 address, val;
drivers/hwmon/w83627ehf.c+6−6
@@ -1866,7 +1866,7 @@ static void w83627ehf_device_remove_files(struct device *dev) · 1865 unmodified lines
1866}1866}
1867 1867
1868/* Get the monitoring functions started */1868/* Get the monitoring functions started */
1869static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,1869static inline void w83627ehf_init_device(struct w83627ehf_data *data,
1870 enum kinds kind)1870 enum kinds kind)
1871{1871{
1872 int i;1872 int i;
@@ -1952,7 +1952,7 @@ static void w82627ehf_swap_tempreg(struct w83627ehf_data *data, · 79 unmodified lines
1952 data->reg_temp_config[r2] = tmp;1952 data->reg_temp_config[r2] = tmp;
1953}1953}
1954 1954
1955static void __devinit1955static void
1956w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp)1956w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp)
1957{1957{
1958 int i;1958 int i;
@@ -1965,7 +1965,7 @@ w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp) · 6 unmodified lines
1965 }1965 }
1966}1966}
1967 1967
1968static void __devinit1968static void
1969w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,1969w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
1970 struct w83627ehf_data *data)1970 struct w83627ehf_data *data)
1971{1971{
@@ -2054,7 +2054,7 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data, · 82 unmodified lines
2054 }2054 }
2055}2055}
2056 2056
2057static int __devinit w83627ehf_probe(struct platform_device *pdev)2057static int w83627ehf_probe(struct platform_device *pdev)
2058{2058{
2059 struct device *dev = &pdev->dev;2059 struct device *dev = &pdev->dev;
2060 struct w83627ehf_sio_data *sio_data = dev->platform_data;2060 struct w83627ehf_sio_data *sio_data = dev->platform_data;
@@ -2596,7 +2596,7 @@ exit: · 535 unmodified lines
2596 return err;2596 return err;
2597}2597}
2598 2598
2599static int __devexit w83627ehf_remove(struct platform_device *pdev)2599static int w83627ehf_remove(struct platform_device *pdev)
2600{2600{
2601 struct w83627ehf_data *data = platform_get_drvdata(pdev);2601 struct w83627ehf_data *data = platform_get_drvdata(pdev);
2602 2602
@@ -2614,7 +2614,7 @@ static struct platform_driver w83627ehf_driver = { · 11 unmodified lines
2614 .name = DRVNAME,2614 .name = DRVNAME,
2615 },2615 },
2616 .probe = w83627ehf_probe,2616 .probe = w83627ehf_probe,
2617 .remove = __devexit_p(w83627ehf_remove),2617 .remove = w83627ehf_remove,
2618};2618};
2619 2619
2620/* w83627ehf_find() looks for a '627 in the Super-I/O config space */2620/* w83627ehf_find() looks for a '627 in the Super-I/O config space */
drivers/hwmon/w83627hf.c+7−7
@@ -393,7 +393,7 @@ struct w83627hf_data { · 392 unmodified lines
393 393
394 394
395static int w83627hf_probe(struct platform_device *pdev);395static int w83627hf_probe(struct platform_device *pdev);
396static int __devexit w83627hf_remove(struct platform_device *pdev);396static int w83627hf_remove(struct platform_device *pdev);
397 397
398static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);398static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
399static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);399static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);
@@ -407,7 +407,7 @@ static struct platform_driver w83627hf_driver = { · 7 unmodified lines
407 .name = DRVNAME,407 .name = DRVNAME,
408 },408 },
409 .probe = w83627hf_probe,409 .probe = w83627hf_probe,
410 .remove = __devexit_p(w83627hf_remove),410 .remove = w83627hf_remove,
411};411};
412 412
413static ssize_t413static ssize_t
@@ -1342,7 +1342,7 @@ static const struct attribute_group w83627hf_group_opt = { · 928 unmodified lines
1342 .attrs = w83627hf_attributes_opt,1342 .attrs = w83627hf_attributes_opt,
1343};1343};
1344 1344
1345static int __devinit w83627hf_probe(struct platform_device *pdev)1345static int w83627hf_probe(struct platform_device *pdev)
1346{1346{
1347 struct device *dev = &pdev->dev;1347 struct device *dev = &pdev->dev;
1348 struct w83627hf_sio_data *sio_data = dev->platform_data;1348 struct w83627hf_sio_data *sio_data = dev->platform_data;
@@ -1508,7 +1508,7 @@ static int __devinit w83627hf_probe(struct platform_device *pdev) · 159 unmodified lines
1508 return err;1508 return err;
1509}1509}
1510 1510
1511static int __devexit w83627hf_remove(struct platform_device *pdev)1511static int w83627hf_remove(struct platform_device *pdev)
1512{1512{
1513 struct w83627hf_data *data = platform_get_drvdata(pdev);1513 struct w83627hf_data *data = platform_get_drvdata(pdev);
1514 1514
@@ -1564,7 +1564,7 @@ static int w83627hf_read_value(struct w83627hf_data *data, u16 reg) · 49 unmodified lines
1564 return res;1564 return res;
1565}1565}
1566 1566
1567static int __devinit w83627thf_read_gpio5(struct platform_device *pdev)1567static int w83627thf_read_gpio5(struct platform_device *pdev)
1568{1568{
1569 struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;1569 struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;
1570 int res = 0xff, sel;1570 int res = 0xff, sel;
@@ -1597,7 +1597,7 @@ exit: · 26 unmodified lines
1597 return res;1597 return res;
1598}1598}
1599 1599
1600static int __devinit w83687thf_read_vid(struct platform_device *pdev)1600static int w83687thf_read_vid(struct platform_device *pdev)
1601{1601{
1602 struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;1602 struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;
1603 int res = 0xff;1603 int res = 0xff;
@@ -1649,7 +1649,7 @@ static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value) · 45 unmodified lines
1649 return 0;1649 return 0;
1650}1650}
1651 1651
1652static void __devinit w83627hf_init_device(struct platform_device *pdev)1652static void w83627hf_init_device(struct platform_device *pdev)
1653{1653{
1654 struct w83627hf_data *data = platform_get_drvdata(pdev);1654 struct w83627hf_data *data = platform_get_drvdata(pdev);
1655 int i;1655 int i;
drivers/hwmon/w83781d.c+3−3
@@ -1764,7 +1764,7 @@ w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value) · 1763 unmodified lines
1764 return 0;1764 return 0;
1765}1765}
1766 1766
1767static int __devinit1767static int
1768w83781d_isa_probe(struct platform_device *pdev)1768w83781d_isa_probe(struct platform_device *pdev)
1769{1769{
1770 int err, reg;1770 int err, reg;
@@ -1824,7 +1824,7 @@ w83781d_isa_probe(struct platform_device *pdev) · 53 unmodified lines
1824 return err;1824 return err;
1825}1825}
1826 1826
1827static int __devexit1827static int
1828w83781d_isa_remove(struct platform_device *pdev)1828w83781d_isa_remove(struct platform_device *pdev)
1829{1829{
1830 struct w83781d_data *data = platform_get_drvdata(pdev);1830 struct w83781d_data *data = platform_get_drvdata(pdev);
@@ -1842,7 +1842,7 @@ static struct platform_driver w83781d_isa_driver = { · 11 unmodified lines
1842 .name = "w83781d",1842 .name = "w83781d",
1843 },1843 },
1844 .probe = w83781d_isa_probe,1844 .probe = w83781d_isa_probe,
1845 .remove = __devexit_p(w83781d_isa_remove),1845 .remove = w83781d_isa_remove,
1846};1846};
1847 1847
1848/* return 1 if a supported chip is found, 0 otherwise */1848/* return 1 if a supported chip is found, 0 otherwise */
drivers/hwmon/wm831x-hwmon.c+3−3
@@ -157,7 +157,7 @@ static const struct attribute_group wm831x_attr_group = { · 156 unmodified lines
157 .attrs = wm831x_attributes,157 .attrs = wm831x_attributes,
158};158};
159 159
160static int __devinit wm831x_hwmon_probe(struct platform_device *pdev)160static int wm831x_hwmon_probe(struct platform_device *pdev)
161{161{
162 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);162 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
163 struct wm831x_hwmon *hwmon;163 struct wm831x_hwmon *hwmon;
@@ -189,7 +189,7 @@ err_sysfs: · 25 unmodified lines
189 return ret;189 return ret;
190}190}
191 191
192static int __devexit wm831x_hwmon_remove(struct platform_device *pdev)192static int wm831x_hwmon_remove(struct platform_device *pdev)
193{193{
194 struct wm831x_hwmon *hwmon = platform_get_drvdata(pdev);194 struct wm831x_hwmon *hwmon = platform_get_drvdata(pdev);
195 195
@@ -201,7 +201,7 @@ static int __devexit wm831x_hwmon_remove(struct platform_device *pdev) · 5 unmodified lines
201 201
202static struct platform_driver wm831x_hwmon_driver = {202static struct platform_driver wm831x_hwmon_driver = {
203 .probe = wm831x_hwmon_probe,203 .probe = wm831x_hwmon_probe,
204 .remove = __devexit_p(wm831x_hwmon_remove),204 .remove = wm831x_hwmon_remove,
205 .driver = {205 .driver = {
206 .name = "wm831x-hwmon",206 .name = "wm831x-hwmon",
207 .owner = THIS_MODULE,207 .owner = THIS_MODULE,
drivers/hwmon/wm8350-hwmon.c+3−3
@@ -91,7 +91,7 @@ static const struct attribute_group wm8350_attr_group = { · 90 unmodified lines
91 .attrs = wm8350_attributes,91 .attrs = wm8350_attributes,
92};92};
93 93
94static int __devinit wm8350_hwmon_probe(struct platform_device *pdev)94static int wm8350_hwmon_probe(struct platform_device *pdev)
95{95{
96 struct wm8350 *wm8350 = platform_get_drvdata(pdev);96 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
97 int ret;97 int ret;
@@ -114,7 +114,7 @@ err: · 16 unmodified lines
114 return ret;114 return ret;
115}115}
116 116
117static int __devexit wm8350_hwmon_remove(struct platform_device *pdev)117static int wm8350_hwmon_remove(struct platform_device *pdev)
118{118{
119 struct wm8350 *wm8350 = platform_get_drvdata(pdev);119 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
120 120
@@ -126,7 +126,7 @@ static int __devexit wm8350_hwmon_remove(struct platform_device *pdev) · 5 unmodified lines
126 126
127static struct platform_driver wm8350_hwmon_driver = {127static struct platform_driver wm8350_hwmon_driver = {
128 .probe = wm8350_hwmon_probe,128 .probe = wm8350_hwmon_probe,
129 .remove = __devexit_p(wm8350_hwmon_remove),129 .remove = wm8350_hwmon_remove,
130 .driver = {130 .driver = {
131 .name = "wm8350-hwmon",131 .name = "wm8350-hwmon",
132 .owner = THIS_MODULE,132 .owner = THIS_MODULE,
drivers/hwspinlock/omap_hwspinlock.c+3−3
@@ -78,7 +78,7 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = { · 77 unmodified lines
78 .relax = omap_hwspinlock_relax,78 .relax = omap_hwspinlock_relax,
79};79};
80 80
81static int __devinit omap_hwspinlock_probe(struct platform_device *pdev)81static int omap_hwspinlock_probe(struct platform_device *pdev)
82{82{
83 struct hwspinlock_pdata *pdata = pdev->dev.platform_data;83 struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
84 struct hwspinlock_device *bank;84 struct hwspinlock_device *bank;
@@ -142,7 +142,7 @@ iounmap_base: · 57 unmodified lines
142 return ret;142 return ret;
143}143}
144 144
145static int __devexit omap_hwspinlock_remove(struct platform_device *pdev)145static int omap_hwspinlock_remove(struct platform_device *pdev)
146{146{
147 struct hwspinlock_device *bank = platform_get_drvdata(pdev);147 struct hwspinlock_device *bank = platform_get_drvdata(pdev);
148 void __iomem *io_base = bank->lock[0].priv - LOCK_BASE_OFFSET;148 void __iomem *io_base = bank->lock[0].priv - LOCK_BASE_OFFSET;
@@ -163,7 +163,7 @@ static int __devexit omap_hwspinlock_remove(struct platform_device *pdev) · 14 unmodified lines
163 163
164static struct platform_driver omap_hwspinlock_driver = {164static struct platform_driver omap_hwspinlock_driver = {
165 .probe = omap_hwspinlock_probe,165 .probe = omap_hwspinlock_probe,
166 .remove = __devexit_p(omap_hwspinlock_remove),166 .remove = omap_hwspinlock_remove,
167 .driver = {167 .driver = {
168 .name = "omap_hwspinlock",168 .name = "omap_hwspinlock",
169 .owner = THIS_MODULE,169 .owner = THIS_MODULE,
drivers/hwspinlock/u8500_hsem.c+3−3
@@ -91,7 +91,7 @@ static const struct hwspinlock_ops u8500_hwspinlock_ops = { · 90 unmodified lines
91 .relax = u8500_hsem_relax,91 .relax = u8500_hsem_relax,
92};92};
93 93
94static int __devinit u8500_hsem_probe(struct platform_device *pdev)94static int u8500_hsem_probe(struct platform_device *pdev)
95{95{
96 struct hwspinlock_pdata *pdata = pdev->dev.platform_data;96 struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
97 struct hwspinlock_device *bank;97 struct hwspinlock_device *bank;
@@ -148,7 +148,7 @@ iounmap_base: · 50 unmodified lines
148 return ret;148 return ret;
149}149}
150 150
151static int __devexit u8500_hsem_remove(struct platform_device *pdev)151static int u8500_hsem_remove(struct platform_device *pdev)
152{152{
153 struct hwspinlock_device *bank = platform_get_drvdata(pdev);153 struct hwspinlock_device *bank = platform_get_drvdata(pdev);
154 void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;154 void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;
@@ -172,7 +172,7 @@ static int __devexit u8500_hsem_remove(struct platform_device *pdev) · 17 unmodified lines
172 172
173static struct platform_driver u8500_hsem_driver = {173static struct platform_driver u8500_hsem_driver = {
174 .probe = u8500_hsem_probe,174 .probe = u8500_hsem_probe,
175 .remove = __devexit_p(u8500_hsem_remove),175 .remove = u8500_hsem_remove,
176 .driver = {176 .driver = {
177 .name = "u8500_hsem",177 .name = "u8500_hsem",
178 .owner = THIS_MODULE,178 .owner = THIS_MODULE,
drivers/leds/leds-adp5520.c+4−4
@@ -85,7 +85,7 @@ static int adp5520_led_setup(struct adp5520_led *led) · 84 unmodified lines
85 return ret;85 return ret;
86}86}
87 87
88static int __devinit adp5520_led_prepare(struct platform_device *pdev)88static int adp5520_led_prepare(struct platform_device *pdev)
89{89{
90 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;90 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
91 struct device *dev = pdev->dev.parent;91 struct device *dev = pdev->dev.parent;
@@ -101,7 +101,7 @@ static int __devinit adp5520_led_prepare(struct platform_device *pdev) · 9 unmodified lines
101 return ret;101 return ret;
102}102}
103 103
104static int __devinit adp5520_led_probe(struct platform_device *pdev)104static int adp5520_led_probe(struct platform_device *pdev)
105{105{
106 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;106 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
107 struct adp5520_led *led, *led_dat;107 struct adp5520_led *led, *led_dat;
@@ -183,7 +183,7 @@ err: · 75 unmodified lines
183 return ret;183 return ret;
184}184}
185 185
186static int __devexit adp5520_led_remove(struct platform_device *pdev)186static int adp5520_led_remove(struct platform_device *pdev)
187{187{
188 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;188 struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
189 struct adp5520_led *led;189 struct adp5520_led *led;
@@ -208,7 +208,7 @@ static struct platform_driver adp5520_led_driver = { · 18 unmodified lines
208 .owner = THIS_MODULE,208 .owner = THIS_MODULE,
209 },209 },
210 .probe = adp5520_led_probe,210 .probe = adp5520_led_probe,
211 .remove = __devexit_p(adp5520_led_remove),211 .remove = adp5520_led_remove,
212};212};
213 213
214module_platform_driver(adp5520_led_driver);214module_platform_driver(adp5520_led_driver);
drivers/leds/leds-asic3.c+3−3
@@ -92,7 +92,7 @@ static int blink_set(struct led_classdev *cdev, · 91 unmodified lines
92 return 0;92 return 0;
93}93}
94 94
95static int __devinit asic3_led_probe(struct platform_device *pdev)95static int asic3_led_probe(struct platform_device *pdev)
96{96{
97 struct asic3_led *led = pdev->dev.platform_data;97 struct asic3_led *led = pdev->dev.platform_data;
98 int ret;98 int ret;
@@ -125,7 +125,7 @@ out: · 26 unmodified lines
125 return ret;125 return ret;
126}126}
127 127
128static int __devexit asic3_led_remove(struct platform_device *pdev)128static int asic3_led_remove(struct platform_device *pdev)
129{129{
130 struct asic3_led *led = pdev->dev.platform_data;130 struct asic3_led *led = pdev->dev.platform_data;
131 131
@@ -167,7 +167,7 @@ static const struct dev_pm_ops asic3_led_pm_ops = { · 35 unmodified lines
167 167
168static struct platform_driver asic3_led_driver = {168static struct platform_driver asic3_led_driver = {
169 .probe = asic3_led_probe,169 .probe = asic3_led_probe,
170 .remove = __devexit_p(asic3_led_remove),170 .remove = asic3_led_remove,
171 .driver = {171 .driver = {
172 .name = "leds-asic3",172 .name = "leds-asic3",
173 .owner = THIS_MODULE,173 .owner = THIS_MODULE,
drivers/leds/leds-atmel-pwm.c+1−1
@@ -35,7 +35,7 @@ static void pwmled_brightness(struct led_classdev *cdev, enum led_brightness b) · 34 unmodified lines
35 * NOTE: we reuse the platform_data structure of GPIO leds,35 * NOTE: we reuse the platform_data structure of GPIO leds,
36 * but repurpose its "gpio" number as a PWM channel number.36 * but repurpose its "gpio" number as a PWM channel number.
37 */37 */
38static int __devinit pwmled_probe(struct platform_device *pdev)38static int pwmled_probe(struct platform_device *pdev)
39{39{
40 const struct gpio_led_platform_data *pdata;40 const struct gpio_led_platform_data *pdata;
41 struct pwmled *leds;41 struct pwmled *leds;
drivers/leds/leds-bd2802.c+1−1
@@ -670,7 +670,7 @@ static void bd2802_unregister_led_classdev(struct bd2802_led *led) · 669 unmodified lines
670 led_classdev_unregister(&led->cdev_led1r);670 led_classdev_unregister(&led->cdev_led1r);
671}671}
672 672
673static int __devinit bd2802_probe(struct i2c_client *client,673static int bd2802_probe(struct i2c_client *client,
674 const struct i2c_device_id *id)674 const struct i2c_device_id *id)
675{675{
676 struct bd2802_led *led;676 struct bd2802_led *led;
drivers/leds/leds-blinkm.c+3−3
@@ -632,7 +632,7 @@ static int blinkm_detect(struct i2c_client *client, struct i2c_board_info *info) · 631 unmodified lines
632 return 0;632 return 0;
633}633}
634 634
635static int __devinit blinkm_probe(struct i2c_client *client,635static int blinkm_probe(struct i2c_client *client,
636 const struct i2c_device_id *id)636 const struct i2c_device_id *id)
637{637{
638 struct blinkm_data *data;638 struct blinkm_data *data;
@@ -743,7 +743,7 @@ exit: · 104 unmodified lines
743 return err;743 return err;
744}744}
745 745
746static int __devexit blinkm_remove(struct i2c_client *client)746static int blinkm_remove(struct i2c_client *client)
747{747{
748 struct blinkm_data *data = i2c_get_clientdata(client);748 struct blinkm_data *data = i2c_get_clientdata(client);
749 int ret = 0;749 int ret = 0;
@@ -801,7 +801,7 @@ static struct i2c_driver blinkm_driver = { · 51 unmodified lines
801 .name = "blinkm",801 .name = "blinkm",
802 },802 },
803 .probe = blinkm_probe,803 .probe = blinkm_probe,
804 .remove = __devexit_p(blinkm_remove),804 .remove = blinkm_remove,
805 .id_table = blinkm_id,805 .id_table = blinkm_id,
806 .detect = blinkm_detect,806 .detect = blinkm_detect,
807 .address_list = normal_i2c,807 .address_list = normal_i2c,
drivers/leds/leds-clevo-mail.c+1−1
@@ -153,7 +153,7 @@ static struct led_classdev clevo_mail_led = { · 152 unmodified lines
153 .flags = LED_CORE_SUSPENDRESUME,153 .flags = LED_CORE_SUSPENDRESUME,
154};154};
155 155
156static int __devinit clevo_mail_led_probe(struct platform_device *pdev)156static int clevo_mail_led_probe(struct platform_device *pdev)
157{157{
158 return led_classdev_register(&pdev->dev, &clevo_mail_led);158 return led_classdev_register(&pdev->dev, &clevo_mail_led);
159}159}
drivers/leds/leds-cobalt-qube.c+3−3
@@ -34,7 +34,7 @@ static struct led_classdev qube_front_led = { · 33 unmodified lines
34 .default_trigger = "default-on",34 .default_trigger = "default-on",
35};35};
36 36
37static int __devinit cobalt_qube_led_probe(struct platform_device *pdev)37static int cobalt_qube_led_probe(struct platform_device *pdev)
38{38{
39 struct resource *res;39 struct resource *res;
40 int retval;40 int retval;
@@ -63,7 +63,7 @@ err_iounmap: · 22 unmodified lines
63 return retval;63 return retval;
64}64}
65 65
66static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)66static int cobalt_qube_led_remove(struct platform_device *pdev)
67{67{
68 led_classdev_unregister(&qube_front_led);68 led_classdev_unregister(&qube_front_led);
69 69
@@ -77,7 +77,7 @@ static int __devexit cobalt_qube_led_remove(struct platform_device *pdev) · 7 unmodified lines
77 77
78static struct platform_driver cobalt_qube_led_driver = {78static struct platform_driver cobalt_qube_led_driver = {
79 .probe = cobalt_qube_led_probe,79 .probe = cobalt_qube_led_probe,
80 .remove = __devexit_p(cobalt_qube_led_remove),80 .remove = cobalt_qube_led_remove,
81 .driver = {81 .driver = {
82 .name = "cobalt-qube-leds",82 .name = "cobalt-qube-leds",
83 .owner = THIS_MODULE,83 .owner = THIS_MODULE,
drivers/leds/leds-cobalt-raq.c+3−3
@@ -76,7 +76,7 @@ static struct led_classdev raq_power_off_led = { · 75 unmodified lines
76 .default_trigger = "power-off",76 .default_trigger = "power-off",
77};77};
78 78
79static int __devinit cobalt_raq_led_probe(struct platform_device *pdev)79static int cobalt_raq_led_probe(struct platform_device *pdev)
80{80{
81 struct resource *res;81 struct resource *res;
82 int retval;82 int retval;
@@ -109,7 +109,7 @@ err_iounmap: · 26 unmodified lines
109 return retval;109 return retval;
110}110}
111 111
112static int __devexit cobalt_raq_led_remove(struct platform_device *pdev)112static int cobalt_raq_led_remove(struct platform_device *pdev)
113{113{
114 led_classdev_unregister(&raq_power_off_led);114 led_classdev_unregister(&raq_power_off_led);
115 led_classdev_unregister(&raq_web_led);115 led_classdev_unregister(&raq_web_led);
@@ -124,7 +124,7 @@ static int __devexit cobalt_raq_led_remove(struct platform_device *pdev) · 8 unmodified lines
124 124
125static struct platform_driver cobalt_raq_led_driver = {125static struct platform_driver cobalt_raq_led_driver = {
126 .probe = cobalt_raq_led_probe,126 .probe = cobalt_raq_led_probe,
127 .remove = __devexit_p(cobalt_raq_led_remove),127 .remove = cobalt_raq_led_remove,
128 .driver = {128 .driver = {
129 .name = "cobalt-raq-leds",129 .name = "cobalt-raq-leds",
130 .owner = THIS_MODULE,130 .owner = THIS_MODULE,
drivers/leds/leds-da903x.c+3−3
@@ -91,7 +91,7 @@ static void da903x_led_set(struct led_classdev *led_cdev, · 90 unmodified lines
91 schedule_work(&led->work);91 schedule_work(&led->work);
92}92}
93 93
94static int __devinit da903x_led_probe(struct platform_device *pdev)94static int da903x_led_probe(struct platform_device *pdev)
95{95{
96 struct led_info *pdata = pdev->dev.platform_data;96 struct led_info *pdata = pdev->dev.platform_data;
97 struct da903x_led *led;97 struct da903x_led *led;
@@ -136,7 +136,7 @@ static int __devinit da903x_led_probe(struct platform_device *pdev) · 38 unmodified lines
136 return 0;136 return 0;
137}137}
138 138
139static int __devexit da903x_led_remove(struct platform_device *pdev)139static int da903x_led_remove(struct platform_device *pdev)
140{140{
141 struct da903x_led *led = platform_get_drvdata(pdev);141 struct da903x_led *led = platform_get_drvdata(pdev);
142 142
@@ -150,7 +150,7 @@ static struct platform_driver da903x_led_driver = { · 7 unmodified lines
150 .owner = THIS_MODULE,150 .owner = THIS_MODULE,
151 },151 },
152 .probe = da903x_led_probe,152 .probe = da903x_led_probe,
153 .remove = __devexit_p(da903x_led_remove),153 .remove = da903x_led_remove,
154};154};
155 155
156module_platform_driver(da903x_led_driver);156module_platform_driver(da903x_led_driver);
drivers/leds/leds-da9052.c+3−3
@@ -102,7 +102,7 @@ static int da9052_configure_leds(struct da9052 *da9052) · 101 unmodified lines
102 return error;102 return error;
103}103}
104 104
105static int __devinit da9052_led_probe(struct platform_device *pdev)105static int da9052_led_probe(struct platform_device *pdev)
106{106{
107 struct da9052_pdata *pdata;107 struct da9052_pdata *pdata;
108 struct da9052 *da9052;108 struct da9052 *da9052;
@@ -176,7 +176,7 @@ err: · 67 unmodified lines
176 return error;176 return error;
177}177}
178 178
179static int __devexit da9052_led_remove(struct platform_device *pdev)179static int da9052_led_remove(struct platform_device *pdev)
180{180{
181 struct da9052_led *led = platform_get_drvdata(pdev);181 struct da9052_led *led = platform_get_drvdata(pdev);
182 struct da9052_pdata *pdata;182 struct da9052_pdata *pdata;
@@ -204,7 +204,7 @@ static struct platform_driver da9052_led_driver = { · 21 unmodified lines
204 .owner = THIS_MODULE,204 .owner = THIS_MODULE,
205 },205 },
206 .probe = da9052_led_probe,206 .probe = da9052_led_probe,
207 .remove = __devexit_p(da9052_led_remove),207 .remove = da9052_led_remove,
208};208};
209 209
210module_platform_driver(da9052_led_driver);210module_platform_driver(da9052_led_driver);
drivers/leds/leds-gpio.c+6−6
@@ -91,7 +91,7 @@ static int gpio_blink_set(struct led_classdev *led_cdev, · 90 unmodified lines
91 delay_on, delay_off);91 delay_on, delay_off);
92}92}
93 93
94static int __devinit create_gpio_led(const struct gpio_led *template,94static int create_gpio_led(const struct gpio_led *template,
95 struct gpio_led_data *led_dat, struct device *parent,95 struct gpio_led_data *led_dat, struct device *parent,
96 int (*blink_set)(unsigned, int, unsigned long *, unsigned long *))96 int (*blink_set)(unsigned, int, unsigned long *, unsigned long *))
97{97{
@@ -167,7 +167,7 @@ static inline int sizeof_gpio_leds_priv(int num_leds) · 69 unmodified lines
167 167
168/* Code to create from OpenFirmware platform devices */168/* Code to create from OpenFirmware platform devices */
169#ifdef CONFIG_OF_GPIO169#ifdef CONFIG_OF_GPIO
170static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)170static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
171{171{
172 struct device_node *np = pdev->dev.of_node, *child;172 struct device_node *np = pdev->dev.of_node, *child;
173 struct gpio_leds_priv *priv;173 struct gpio_leds_priv *priv;
@@ -224,14 +224,14 @@ static const struct of_device_id of_gpio_leds_match[] = { · 50 unmodified lines
224 {},224 {},
225};225};
226#else /* CONFIG_OF_GPIO */226#else /* CONFIG_OF_GPIO */
227static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_device *pdev)227static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
228{228{
229 return NULL;229 return NULL;
230}230}
231#endif /* CONFIG_OF_GPIO */231#endif /* CONFIG_OF_GPIO */
232 232
233 233
234static int __devinit gpio_led_probe(struct platform_device *pdev)234static int gpio_led_probe(struct platform_device *pdev)
235{235{
236 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;236 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
237 struct gpio_leds_priv *priv;237 struct gpio_leds_priv *priv;
@@ -273,7 +273,7 @@ static int __devinit gpio_led_probe(struct platform_device *pdev) · 35 unmodified lines
273 return 0;273 return 0;
274}274}
275 275
276static int __devexit gpio_led_remove(struct platform_device *pdev)276static int gpio_led_remove(struct platform_device *pdev)
277{277{
278 struct gpio_leds_priv *priv = platform_get_drvdata(pdev);278 struct gpio_leds_priv *priv = platform_get_drvdata(pdev);
279 int i;279 int i;
@@ -288,7 +288,7 @@ static int __devexit gpio_led_remove(struct platform_device *pdev) · 8 unmodified lines
288 288
289static struct platform_driver gpio_led_driver = {289static struct platform_driver gpio_led_driver = {
290 .probe = gpio_led_probe,290 .probe = gpio_led_probe,
291 .remove = __devexit_p(gpio_led_remove),291 .remove = gpio_led_remove,
292 .driver = {292 .driver = {
293 .name = "leds-gpio",293 .name = "leds-gpio",
294 .owner = THIS_MODULE,294 .owner = THIS_MODULE,
drivers/leds/leds-lm3530.c+3−3
@@ -377,7 +377,7 @@ static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute · 376 unmodified lines
377}377}
378static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);378static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);
379 379
380static int __devinit lm3530_probe(struct i2c_client *client,380static int lm3530_probe(struct i2c_client *client,
381 const struct i2c_device_id *id)381 const struct i2c_device_id *id)
382{382{
383 struct lm3530_platform_data *pdata = client->dev.platform_data;383 struct lm3530_platform_data *pdata = client->dev.platform_data;
@@ -452,7 +452,7 @@ err_create_file: · 68 unmodified lines
452 return err;452 return err;
453}453}
454 454
455static int __devexit lm3530_remove(struct i2c_client *client)455static int lm3530_remove(struct i2c_client *client)
456{456{
457 struct lm3530_data *drvdata = i2c_get_clientdata(client);457 struct lm3530_data *drvdata = i2c_get_clientdata(client);
458 458
@@ -472,7 +472,7 @@ MODULE_DEVICE_TABLE(i2c, lm3530_id); · 13 unmodified lines
472 472
473static struct i2c_driver lm3530_i2c_driver = {473static struct i2c_driver lm3530_i2c_driver = {
474 .probe = lm3530_probe,474 .probe = lm3530_probe,
475 .remove = __devexit_p(lm3530_remove),475 .remove = lm3530_remove,
476 .id_table = lm3530_id,476 .id_table = lm3530_id,
477 .driver = {477 .driver = {
478 .name = LM3530_NAME,478 .name = LM3530_NAME,
drivers/leds/leds-lm3533.c+4−4
@@ -646,7 +646,7 @@ static struct attribute_group lm3533_led_attribute_group = { · 645 unmodified lines
646 .attrs = lm3533_led_attributes646 .attrs = lm3533_led_attributes
647};647};
648 648
649static int __devinit lm3533_led_setup(struct lm3533_led *led,649static int lm3533_led_setup(struct lm3533_led *led,
650 struct lm3533_led_platform_data *pdata)650 struct lm3533_led_platform_data *pdata)
651{651{
652 int ret;652 int ret;
@@ -658,7 +658,7 @@ static int __devinit lm3533_led_setup(struct lm3533_led *led, · 5 unmodified lines
658 return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);658 return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);
659}659}
660 660
661static int __devinit lm3533_led_probe(struct platform_device *pdev)661static int lm3533_led_probe(struct platform_device *pdev)
662{662{
663 struct lm3533 *lm3533;663 struct lm3533 *lm3533;
664 struct lm3533_led_platform_data *pdata;664 struct lm3533_led_platform_data *pdata;
@@ -742,7 +742,7 @@ err_unregister: · 77 unmodified lines
742 return ret;742 return ret;
743}743}
744 744
745static int __devexit lm3533_led_remove(struct platform_device *pdev)745static int lm3533_led_remove(struct platform_device *pdev)
746{746{
747 struct lm3533_led *led = platform_get_drvdata(pdev);747 struct lm3533_led *led = platform_get_drvdata(pdev);
748 748
@@ -774,7 +774,7 @@ static struct platform_driver lm3533_led_driver = { · 25 unmodified lines
774 .owner = THIS_MODULE,774 .owner = THIS_MODULE,
775 },775 },
776 .probe = lm3533_led_probe,776 .probe = lm3533_led_probe,
777 .remove = __devexit_p(lm3533_led_remove),777 .remove = lm3533_led_remove,
778 .shutdown = lm3533_led_shutdown,778 .shutdown = lm3533_led_shutdown,
779};779};
780module_platform_driver(lm3533_led_driver);780module_platform_driver(lm3533_led_driver);
drivers/leds/leds-lm355x.c+4−4
@@ -168,7 +168,7 @@ static char lm355x_name[][I2C_NAME_SIZE] = { · 167 unmodified lines
168};168};
169 169
170/* chip initialize */170/* chip initialize */
171static int __devinit lm355x_chip_init(struct lm355x_chip_data *chip)171static int lm355x_chip_init(struct lm355x_chip_data *chip)
172{172{
173 int ret;173 int ret;
174 unsigned int reg_val;174 unsigned int reg_val;
@@ -420,7 +420,7 @@ static const struct regmap_config lm355x_regmap = { · 245 unmodified lines
420};420};
421 421
422/* module initialize */422/* module initialize */
423static int __devinit lm355x_probe(struct i2c_client *client,423static int lm355x_probe(struct i2c_client *client,
424 const struct i2c_device_id *id)424 const struct i2c_device_id *id)
425{425{
426 struct lm355x_platform_data *pdata = client->dev.platform_data;426 struct lm355x_platform_data *pdata = client->dev.platform_data;
@@ -526,7 +526,7 @@ err_out: · 99 unmodified lines
526 return err;526 return err;
527}527}
528 528
529static int __devexit lm355x_remove(struct i2c_client *client)529static int lm355x_remove(struct i2c_client *client)
530{530{
531 struct lm355x_chip_data *chip = i2c_get_clientdata(client);531 struct lm355x_chip_data *chip = i2c_get_clientdata(client);
532 struct lm355x_reg_data *preg = chip->regs;532 struct lm355x_reg_data *preg = chip->regs;
@@ -560,7 +560,7 @@ static struct i2c_driver lm355x_i2c_driver = { · 27 unmodified lines
560 .pm = NULL,560 .pm = NULL,
561 },561 },
562 .probe = lm355x_probe,562 .probe = lm355x_probe,
563 .remove = __devexit_p(lm355x_remove),563 .remove = lm355x_remove,
564 .id_table = lm355x_id,564 .id_table = lm355x_id,
565};565};
566 566
drivers/leds/leds-lm3642.c+4−4
@@ -93,7 +93,7 @@ struct lm3642_chip_data { · 92 unmodified lines
93};93};
94 94
95/* chip initialize */95/* chip initialize */
96static int __devinit lm3642_chip_init(struct lm3642_chip_data *chip)96static int lm3642_chip_init(struct lm3642_chip_data *chip)
97{97{
98 int ret;98 int ret;
99 struct lm3642_platform_data *pdata = chip->pdata;99 struct lm3642_platform_data *pdata = chip->pdata;
@@ -313,7 +313,7 @@ static const struct regmap_config lm3642_regmap = { · 213 unmodified lines
313 .max_register = REG_MAX,313 .max_register = REG_MAX,
314};314};
315 315
316static int __devinit lm3642_probe(struct i2c_client *client,316static int lm3642_probe(struct i2c_client *client,
317 const struct i2c_device_id *id)317 const struct i2c_device_id *id)
318{318{
319 struct lm3642_platform_data *pdata = client->dev.platform_data;319 struct lm3642_platform_data *pdata = client->dev.platform_data;
@@ -420,7 +420,7 @@ err_out: · 100 unmodified lines
420 return err;420 return err;
421}421}
422 422
423static int __devexit lm3642_remove(struct i2c_client *client)423static int lm3642_remove(struct i2c_client *client)
424{424{
425 struct lm3642_chip_data *chip = i2c_get_clientdata(client);425 struct lm3642_chip_data *chip = i2c_get_clientdata(client);
426 426
@@ -450,7 +450,7 @@ static struct i2c_driver lm3642_i2c_driver = { · 23 unmodified lines
450 .pm = NULL,450 .pm = NULL,
451 },451 },
452 .probe = lm3642_probe,452 .probe = lm3642_probe,
453 .remove = __devexit_p(lm3642_remove),453 .remove = lm3642_remove,
454 .id_table = lm3642_id,454 .id_table = lm3642_id,
455};455};
456 456
drivers/leds/leds-lp3944.c+3−3
@@ -374,7 +374,7 @@ exit: · 373 unmodified lines
374 return err;374 return err;
375}375}
376 376
377static int __devinit lp3944_probe(struct i2c_client *client,377static int lp3944_probe(struct i2c_client *client,
378 const struct i2c_device_id *id)378 const struct i2c_device_id *id)
379{379{
380 struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;380 struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;
@@ -411,7 +411,7 @@ static int __devinit lp3944_probe(struct i2c_client *client, · 30 unmodified lines
411 return 0;411 return 0;
412}412}
413 413
414static int __devexit lp3944_remove(struct i2c_client *client)414static int lp3944_remove(struct i2c_client *client)
415{415{
416 struct lp3944_platform_data *pdata = client->dev.platform_data;416 struct lp3944_platform_data *pdata = client->dev.platform_data;
417 struct lp3944_data *data = i2c_get_clientdata(client);417 struct lp3944_data *data = i2c_get_clientdata(client);
@@ -446,7 +446,7 @@ static struct i2c_driver lp3944_driver = { · 28 unmodified lines
446 .name = "lp3944",446 .name = "lp3944",
447 },447 },
448 .probe = lp3944_probe,448 .probe = lp3944_probe,
449 .remove = __devexit_p(lp3944_remove),449 .remove = lp3944_remove,
450 .id_table = lp3944_id,450 .id_table = lp3944_id,
451};451};
452 452
drivers/leds/leds-lp5521.c+4−4
@@ -687,7 +687,7 @@ static void lp5521_unregister_sysfs(struct i2c_client *client) · 686 unmodified lines
687 &lp5521_led_attribute_group);687 &lp5521_led_attribute_group);
688}688}
689 689
690static int __devinit lp5521_init_led(struct lp5521_led *led,690static int lp5521_init_led(struct lp5521_led *led,
691 struct i2c_client *client,691 struct i2c_client *client,
692 int chan, struct lp5521_platform_data *pdata)692 int chan, struct lp5521_platform_data *pdata)
693{693{
@@ -736,7 +736,7 @@ static int __devinit lp5521_init_led(struct lp5521_led *led, · 42 unmodified lines
736 return 0;736 return 0;
737}737}
738 738
739static int __devinit lp5521_probe(struct i2c_client *client,739static int lp5521_probe(struct i2c_client *client,
740 const struct i2c_device_id *id)740 const struct i2c_device_id *id)
741{741{
742 struct lp5521_chip *chip;742 struct lp5521_chip *chip;
@@ -855,7 +855,7 @@ fail1: · 112 unmodified lines
855 return ret;855 return ret;
856}856}
857 857
858static int __devexit lp5521_remove(struct i2c_client *client)858static int lp5521_remove(struct i2c_client *client)
859{859{
860 struct lp5521_chip *chip = i2c_get_clientdata(client);860 struct lp5521_chip *chip = i2c_get_clientdata(client);
861 int i;861 int i;
@@ -886,7 +886,7 @@ static struct i2c_driver lp5521_driver = { · 24 unmodified lines
886 .name = "lp5521",886 .name = "lp5521",
887 },887 },
888 .probe = lp5521_probe,888 .probe = lp5521_probe,
889 .remove = __devexit_p(lp5521_remove),889 .remove = lp5521_remove,
890 .id_table = lp5521_id,890 .id_table = lp5521_id,
891};891};
892 892
drivers/leds/leds-lp5523.c+2−2
@@ -833,7 +833,7 @@ static int __init lp5523_init_engine(struct lp5523_engine *engine, int id) · 832 unmodified lines
833 return 0;833 return 0;
834}834}
835 835
836static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,836static int lp5523_init_led(struct lp5523_led *led, struct device *dev,
837 int chan, struct lp5523_platform_data *pdata,837 int chan, struct lp5523_platform_data *pdata,
838 const char *chip_name)838 const char *chip_name)
839{839{
@@ -882,7 +882,7 @@ static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev, · 42 unmodified lines
882 return 0;882 return 0;
883}883}
884 884
885static int __devinit lp5523_probe(struct i2c_client *client,885static int lp5523_probe(struct i2c_client *client,
886 const struct i2c_device_id *id)886 const struct i2c_device_id *id)
887{887{
888 struct lp5523_chip *chip;888 struct lp5523_chip *chip;
drivers/leds/leds-lp8788.c+3−3
@@ -125,7 +125,7 @@ static void lp8788_brightness_set(struct led_classdev *led_cdev, · 124 unmodified lines
125 schedule_work(&led->work);125 schedule_work(&led->work);
126}126}
127 127
128static __devinit int lp8788_led_probe(struct platform_device *pdev)128static int lp8788_led_probe(struct platform_device *pdev)
129{129{
130 struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);130 struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
131 struct lp8788_led_platform_data *led_pdata;131 struct lp8788_led_platform_data *led_pdata;
@@ -167,7 +167,7 @@ static __devinit int lp8788_led_probe(struct platform_device *pdev) · 35 unmodified lines
167 return 0;167 return 0;
168}168}
169 169
170static int __devexit lp8788_led_remove(struct platform_device *pdev)170static int lp8788_led_remove(struct platform_device *pdev)
171{171{
172 struct lp8788_led *led = platform_get_drvdata(pdev);172 struct lp8788_led *led = platform_get_drvdata(pdev);
173 173
@@ -179,7 +179,7 @@ static int __devexit lp8788_led_remove(struct platform_device *pdev) · 5 unmodified lines
179 179
180static struct platform_driver lp8788_led_driver = {180static struct platform_driver lp8788_led_driver = {
181 .probe = lp8788_led_probe,181 .probe = lp8788_led_probe,
182 .remove = __devexit_p(lp8788_led_remove),182 .remove = lp8788_led_remove,
183 .driver = {183 .driver = {
184 .name = LP8788_DEV_KEYLED,184 .name = LP8788_DEV_KEYLED,
185 .owner = THIS_MODULE,185 .owner = THIS_MODULE,
drivers/leds/leds-lt3593.c+4−4
@@ -82,7 +82,7 @@ static void lt3593_led_set(struct led_classdev *led_cdev, · 81 unmodified lines
82 schedule_work(&led_dat->work);82 schedule_work(&led_dat->work);
83}83}
84 84
85static int __devinit create_lt3593_led(const struct gpio_led *template,85static int create_lt3593_led(const struct gpio_led *template,
86 struct lt3593_led_data *led_dat, struct device *parent)86 struct lt3593_led_data *led_dat, struct device *parent)
87{87{
88 int ret, state;88 int ret, state;
@@ -140,7 +140,7 @@ static void delete_lt3593_led(struct lt3593_led_data *led) · 51 unmodified lines
140 gpio_free(led->gpio);140 gpio_free(led->gpio);
141}141}
142 142
143static int __devinit lt3593_led_probe(struct platform_device *pdev)143static int lt3593_led_probe(struct platform_device *pdev)
144{144{
145 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;145 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
146 struct lt3593_led_data *leds_data;146 struct lt3593_led_data *leds_data;
@@ -173,7 +173,7 @@ err: · 26 unmodified lines
173 return ret;173 return ret;
174}174}
175 175
176static int __devexit lt3593_led_remove(struct platform_device *pdev)176static int lt3593_led_remove(struct platform_device *pdev)
177{177{
178 int i;178 int i;
179 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;179 struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
@@ -189,7 +189,7 @@ static int __devexit lt3593_led_remove(struct platform_device *pdev) · 9 unmodified lines
189 189
190static struct platform_driver lt3593_led_driver = {190static struct platform_driver lt3593_led_driver = {
191 .probe = lt3593_led_probe,191 .probe = lt3593_led_probe,
192 .remove = __devexit_p(lt3593_led_remove),192 .remove = lt3593_led_remove,
193 .driver = {193 .driver = {
194 .name = "leds-lt3593",194 .name = "leds-lt3593",
195 .owner = THIS_MODULE,195 .owner = THIS_MODULE,
drivers/leds/leds-max8997.c+3−3
@@ -229,7 +229,7 @@ static ssize_t max8997_led_store_mode(struct device *dev, · 228 unmodified lines
229 229
230static DEVICE_ATTR(mode, 0644, max8997_led_show_mode, max8997_led_store_mode);230static DEVICE_ATTR(mode, 0644, max8997_led_show_mode, max8997_led_store_mode);
231 231
232static int __devinit max8997_led_probe(struct platform_device *pdev)232static int max8997_led_probe(struct platform_device *pdev)
233{233{
234 struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);234 struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
235 struct max8997_platform_data *pdata = dev_get_platdata(iodev->dev);235 struct max8997_platform_data *pdata = dev_get_platdata(iodev->dev);
@@ -292,7 +292,7 @@ static int __devinit max8997_led_probe(struct platform_device *pdev) · 56 unmodified lines
292 return 0;292 return 0;
293}293}
294 294
295static int __devexit max8997_led_remove(struct platform_device *pdev)295static int max8997_led_remove(struct platform_device *pdev)
296{296{
297 struct max8997_led *led = platform_get_drvdata(pdev);297 struct max8997_led *led = platform_get_drvdata(pdev);
298 298
@@ -308,7 +308,7 @@ static struct platform_driver max8997_led_driver = { · 9 unmodified lines
308 .owner = THIS_MODULE,308 .owner = THIS_MODULE,
309 },309 },
310 .probe = max8997_led_probe,310 .probe = max8997_led_probe,
311 .remove = __devexit_p(max8997_led_remove),311 .remove = max8997_led_remove,
312};312};
313 313
314module_platform_driver(max8997_led_driver);314module_platform_driver(max8997_led_driver);
drivers/leds/leds-mc13783.c+5−5
@@ -128,7 +128,7 @@ static void mc13783_led_set(struct led_classdev *led_cdev, · 127 unmodified lines
128 schedule_work(&led->work);128 schedule_work(&led->work);
129}129}
130 130
131static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current)131static int mc13783_led_setup(struct mc13783_led *led, int max_current)
132{132{
133 int shift = 0;133 int shift = 0;
134 int mask = 0;134 int mask = 0;
@@ -181,7 +181,7 @@ static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current) · 46 unmodified lines
181 return ret;181 return ret;
182}182}
183 183
184static int __devinit mc13783_leds_prepare(struct platform_device *pdev)184static int mc13783_leds_prepare(struct platform_device *pdev)
185{185{
186 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);186 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
187 struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);187 struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
@@ -262,7 +262,7 @@ out: · 74 unmodified lines
262 return ret;262 return ret;
263}263}
264 264
265static int __devinit mc13783_led_probe(struct platform_device *pdev)265static int mc13783_led_probe(struct platform_device *pdev)
266{266{
267 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);267 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
268 struct mc13xxx_led_platform_data *led_cur;268 struct mc13xxx_led_platform_data *led_cur;
@@ -348,7 +348,7 @@ err_register: · 79 unmodified lines
348 return ret;348 return ret;
349}349}
350 350
351static int __devexit mc13783_led_remove(struct platform_device *pdev)351static int mc13783_led_remove(struct platform_device *pdev)
352{352{
353 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);353 struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
354 struct mc13783_led *led = platform_get_drvdata(pdev);354 struct mc13783_led *led = platform_get_drvdata(pdev);
@@ -381,7 +381,7 @@ static struct platform_driver mc13783_led_driver = { · 26 unmodified lines
381 .owner = THIS_MODULE,381 .owner = THIS_MODULE,
382 },382 },
383 .probe = mc13783_led_probe,383 .probe = mc13783_led_probe,
384 .remove = __devexit_p(mc13783_led_remove),384 .remove = mc13783_led_remove,
385};385};
386 386
387module_platform_driver(mc13783_led_driver);387module_platform_driver(mc13783_led_driver);
drivers/leds/leds-netxbig.c+5−5
@@ -71,7 +71,7 @@ static void gpio_ext_set_value(struct netxbig_gpio_ext *gpio_ext, · 70 unmodified lines
71 spin_unlock_irqrestore(&gpio_ext_lock, flags);71 spin_unlock_irqrestore(&gpio_ext_lock, flags);
72}72}
73 73
74static int __devinit gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)74static int gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
75{75{
76 int err;76 int err;
77 int i;77 int i;
@@ -301,7 +301,7 @@ static void delete_netxbig_led(struct netxbig_led_data *led_dat) · 223 unmodified lines
301 led_classdev_unregister(&led_dat->cdev);301 led_classdev_unregister(&led_dat->cdev);
302}302}
303 303
304static int __devinit304static int
305create_netxbig_led(struct platform_device *pdev,305create_netxbig_led(struct platform_device *pdev,
306 struct netxbig_led_data *led_dat,306 struct netxbig_led_data *led_dat,
307 const struct netxbig_led *template)307 const struct netxbig_led *template)
@@ -352,7 +352,7 @@ create_netxbig_led(struct platform_device *pdev, · 44 unmodified lines
352 return ret;352 return ret;
353}353}
354 354
355static int __devinit netxbig_led_probe(struct platform_device *pdev)355static int netxbig_led_probe(struct platform_device *pdev)
356{356{
357 struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;357 struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
358 struct netxbig_led_data *leds_data;358 struct netxbig_led_data *leds_data;
@@ -389,7 +389,7 @@ err_free_leds: · 30 unmodified lines
389 return ret;389 return ret;
390}390}
391 391
392static int __devexit netxbig_led_remove(struct platform_device *pdev)392static int netxbig_led_remove(struct platform_device *pdev)
393{393{
394 struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;394 struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
395 struct netxbig_led_data *leds_data;395 struct netxbig_led_data *leds_data;
@@ -407,7 +407,7 @@ static int __devexit netxbig_led_remove(struct platform_device *pdev) · 11 unmodified lines
407 407
408static struct platform_driver netxbig_led_driver = {408static struct platform_driver netxbig_led_driver = {
409 .probe = netxbig_led_probe,409 .probe = netxbig_led_probe,
410 .remove = __devexit_p(netxbig_led_remove),410 .remove = netxbig_led_remove,
411 .driver = {411 .driver = {
412 .name = "leds-netxbig",412 .name = "leds-netxbig",
413 .owner = THIS_MODULE,413 .owner = THIS_MODULE,
drivers/leds/leds-ns2.c+4−4
@@ -184,7 +184,7 @@ static ssize_t ns2_led_sata_show(struct device *dev, · 183 unmodified lines
184 184
185static DEVICE_ATTR(sata, 0644, ns2_led_sata_show, ns2_led_sata_store);185static DEVICE_ATTR(sata, 0644, ns2_led_sata_show, ns2_led_sata_store);
186 186
187static int __devinit187static int
188create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,188create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
189 const struct ns2_led *template)189 const struct ns2_led *template)
190{190{
@@ -263,7 +263,7 @@ static void delete_ns2_led(struct ns2_led_data *led_dat) · 72 unmodified lines
263 gpio_free(led_dat->slow);263 gpio_free(led_dat->slow);
264}264}
265 265
266static int __devinit ns2_led_probe(struct platform_device *pdev)266static int ns2_led_probe(struct platform_device *pdev)
267{267{
268 struct ns2_led_platform_data *pdata = pdev->dev.platform_data;268 struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
269 struct ns2_led_data *leds_data;269 struct ns2_led_data *leds_data;
@@ -292,7 +292,7 @@ static int __devinit ns2_led_probe(struct platform_device *pdev) · 22 unmodified lines
292 return 0;292 return 0;
293}293}
294 294
295static int __devexit ns2_led_remove(struct platform_device *pdev)295static int ns2_led_remove(struct platform_device *pdev)
296{296{
297 int i;297 int i;
298 struct ns2_led_platform_data *pdata = pdev->dev.platform_data;298 struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
@@ -310,7 +310,7 @@ static int __devexit ns2_led_remove(struct platform_device *pdev) · 11 unmodified lines
310 310
311static struct platform_driver ns2_led_driver = {311static struct platform_driver ns2_led_driver = {
312 .probe = ns2_led_probe,312 .probe = ns2_led_probe,
313 .remove = __devexit_p(ns2_led_remove),313 .remove = ns2_led_remove,
314 .driver = {314 .driver = {
315 .name = "leds-ns2",315 .name = "leds-ns2",
316 .owner = THIS_MODULE,316 .owner = THIS_MODULE,
drivers/leds/leds-ot200.c+3−3
@@ -115,7 +115,7 @@ static void ot200_led_brightness_set(struct led_classdev *led_cdev, · 114 unmodified lines
115 spin_unlock_irqrestore(&value_lock, flags);115 spin_unlock_irqrestore(&value_lock, flags);
116}116}
117 117
118static int __devinit ot200_led_probe(struct platform_device *pdev)118static int ot200_led_probe(struct platform_device *pdev)
119{119{
120 int i;120 int i;
121 int ret;121 int ret;
@@ -144,7 +144,7 @@ err: · 22 unmodified lines
144 return ret;144 return ret;
145}145}
146 146
147static int __devexit ot200_led_remove(struct platform_device *pdev)147static int ot200_led_remove(struct platform_device *pdev)
148{148{
149 int i;149 int i;
150 150
@@ -156,7 +156,7 @@ static int __devexit ot200_led_remove(struct platform_device *pdev) · 5 unmodified lines
156 156
157static struct platform_driver ot200_led_driver = {157static struct platform_driver ot200_led_driver = {
158 .probe = ot200_led_probe,158 .probe = ot200_led_probe,
159 .remove = __devexit_p(ot200_led_remove),159 .remove = ot200_led_remove,
160 .driver = {160 .driver = {
161 .name = "leds-ot200",161 .name = "leds-ot200",
162 .owner = THIS_MODULE,162 .owner = THIS_MODULE,
drivers/leds/leds-pca955x.c+3−3
@@ -255,7 +255,7 @@ static void pca955x_led_set(struct led_classdev *led_cdev, enum led_brightness v · 254 unmodified lines
255 schedule_work(&pca955x->work);255 schedule_work(&pca955x->work);
256}256}
257 257
258static int __devinit pca955x_probe(struct i2c_client *client,258static int pca955x_probe(struct i2c_client *client,
259 const struct i2c_device_id *id)259 const struct i2c_device_id *id)
260{260{
261 struct pca955x *pca955x;261 struct pca955x *pca955x;
@@ -363,7 +363,7 @@ exit: · 101 unmodified lines
363 return err;363 return err;
364}364}
365 365
366static int __devexit pca955x_remove(struct i2c_client *client)366static int pca955x_remove(struct i2c_client *client)
367{367{
368 struct pca955x *pca955x = i2c_get_clientdata(client);368 struct pca955x *pca955x = i2c_get_clientdata(client);
369 int i;369 int i;
@@ -382,7 +382,7 @@ static struct i2c_driver pca955x_driver = { · 12 unmodified lines
382 .owner = THIS_MODULE,382 .owner = THIS_MODULE,
383 },383 },
384 .probe = pca955x_probe,384 .probe = pca955x_probe,
385 .remove = __devexit_p(pca955x_remove),385 .remove = pca955x_remove,
386 .id_table = pca955x_id,386 .id_table = pca955x_id,
387};387};
388 388
drivers/leds/leds-pca9633.c+3−3
@@ -93,7 +93,7 @@ static void pca9633_led_set(struct led_classdev *led_cdev, · 92 unmodified lines
93 schedule_work(&pca9633->work);93 schedule_work(&pca9633->work);
94}94}
95 95
96static int __devinit pca9633_probe(struct i2c_client *client,96static int pca9633_probe(struct i2c_client *client,
97 const struct i2c_device_id *id)97 const struct i2c_device_id *id)
98{98{
99 struct pca9633_led *pca9633;99 struct pca9633_led *pca9633;
@@ -164,7 +164,7 @@ exit: · 64 unmodified lines
164 return err;164 return err;
165}165}
166 166
167static int __devexit pca9633_remove(struct i2c_client *client)167static int pca9633_remove(struct i2c_client *client)
168{168{
169 struct pca9633_led *pca9633 = i2c_get_clientdata(client);169 struct pca9633_led *pca9633 = i2c_get_clientdata(client);
170 int i;170 int i;
@@ -183,7 +183,7 @@ static struct i2c_driver pca9633_driver = { · 12 unmodified lines
183 .owner = THIS_MODULE,183 .owner = THIS_MODULE,
184 },184 },
185 .probe = pca9633_probe,185 .probe = pca9633_probe,
186 .remove = __devexit_p(pca9633_remove),186 .remove = pca9633_remove,
187 .id_table = pca9633_id,187 .id_table = pca9633_id,
188};188};
189 189
drivers/leds/leds-pwm.c+2−2
@@ -107,7 +107,7 @@ err: · 106 unmodified lines
107 return ret;107 return ret;
108}108}
109 109
110static int __devexit led_pwm_remove(struct platform_device *pdev)110static int led_pwm_remove(struct platform_device *pdev)
111{111{
112 int i;112 int i;
113 struct led_pwm_platform_data *pdata = pdev->dev.platform_data;113 struct led_pwm_platform_data *pdata = pdev->dev.platform_data;
@@ -125,7 +125,7 @@ static int __devexit led_pwm_remove(struct platform_device *pdev) · 11 unmodified lines
125 125
126static struct platform_driver led_pwm_driver = {126static struct platform_driver led_pwm_driver = {
127 .probe = led_pwm_probe,127 .probe = led_pwm_probe,
128 .remove = __devexit_p(led_pwm_remove),128 .remove = led_pwm_remove,
129 .driver = {129 .driver = {
130 .name = "leds_pwm",130 .name = "leds_pwm",
131 .owner = THIS_MODULE,131 .owner = THIS_MODULE,
drivers/leds/leds-rb532.c+3−3
@@ -37,12 +37,12 @@ static struct led_classdev rb532_uled = { · 36 unmodified lines
37 .default_trigger = "nand-disk",37 .default_trigger = "nand-disk",
38};38};
39 39
40static int __devinit rb532_led_probe(struct platform_device *pdev)40static int rb532_led_probe(struct platform_device *pdev)
41{41{
42 return led_classdev_register(&pdev->dev, &rb532_uled);42 return led_classdev_register(&pdev->dev, &rb532_uled);
43}43}
44 44
45static int __devexit rb532_led_remove(struct platform_device *pdev)45static int rb532_led_remove(struct platform_device *pdev)
46{46{
47 led_classdev_unregister(&rb532_uled);47 led_classdev_unregister(&rb532_uled);
48 return 0;48 return 0;
@@ -50,7 +50,7 @@ static int __devexit rb532_led_remove(struct platform_device *pdev) · 1 unmodified line
50 50
51static struct platform_driver rb532_led_driver = {51static struct platform_driver rb532_led_driver = {
52 .probe = rb532_led_probe,52 .probe = rb532_led_probe,
53 .remove = __devexit_p(rb532_led_remove),53 .remove = rb532_led_remove,
54 .driver = {54 .driver = {
55 .name = "rb532-led",55 .name = "rb532-led",
56 .owner = THIS_MODULE,56 .owner = THIS_MODULE,
drivers/leds/leds-regulator.c+3−3
@@ -140,7 +140,7 @@ static void regulator_led_brightness_set(struct led_classdev *led_cdev, · 139 unmodified lines
140 schedule_work(&led->work);140 schedule_work(&led->work);
141}141}
142 142
143static int __devinit regulator_led_probe(struct platform_device *pdev)143static int regulator_led_probe(struct platform_device *pdev)
144{144{
145 struct led_regulator_platform_data *pdata = pdev->dev.platform_data;145 struct led_regulator_platform_data *pdata = pdev->dev.platform_data;
146 struct regulator_led *led;146 struct regulator_led *led;
@@ -206,7 +206,7 @@ err_vcc: · 59 unmodified lines
206 return ret;206 return ret;
207}207}
208 208
209static int __devexit regulator_led_remove(struct platform_device *pdev)209static int regulator_led_remove(struct platform_device *pdev)
210{210{
211 struct regulator_led *led = platform_get_drvdata(pdev);211 struct regulator_led *led = platform_get_drvdata(pdev);
212 212
@@ -223,7 +223,7 @@ static struct platform_driver regulator_led_driver = { · 10 unmodified lines
223 .owner = THIS_MODULE,223 .owner = THIS_MODULE,
224 },224 },
225 .probe = regulator_led_probe,225 .probe = regulator_led_probe,
226 .remove = __devexit_p(regulator_led_remove),226 .remove = regulator_led_remove,
227};227};
228 228
229module_platform_driver(regulator_led_driver);229module_platform_driver(regulator_led_driver);
drivers/leds/leds-renesas-tpu.c+3−3
@@ -238,7 +238,7 @@ static void r_tpu_set_brightness(struct led_classdev *ldev, · 237 unmodified lines
238 schedule_work(&p->work);238 schedule_work(&p->work);
239}239}
240 240
241static int __devinit r_tpu_probe(struct platform_device *pdev)241static int r_tpu_probe(struct platform_device *pdev)
242{242{
243 struct led_renesas_tpu_config *cfg = pdev->dev.platform_data;243 struct led_renesas_tpu_config *cfg = pdev->dev.platform_data;
244 struct r_tpu_priv *p;244 struct r_tpu_priv *p;
@@ -309,7 +309,7 @@ static int __devinit r_tpu_probe(struct platform_device *pdev) · 64 unmodified lines
309 return ret;309 return ret;
310}310}
311 311
312static int __devexit r_tpu_remove(struct platform_device *pdev)312static int r_tpu_remove(struct platform_device *pdev)
313{313{
314 struct r_tpu_priv *p = platform_get_drvdata(pdev);314 struct r_tpu_priv *p = platform_get_drvdata(pdev);
315 315
@@ -328,7 +328,7 @@ static int __devexit r_tpu_remove(struct platform_device *pdev) · 12 unmodified lines
328 328
329static struct platform_driver r_tpu_device_driver = {329static struct platform_driver r_tpu_device_driver = {
330 .probe = r_tpu_probe,330 .probe = r_tpu_probe,
331 .remove = __devexit_p(r_tpu_remove),331 .remove = r_tpu_remove,
332 .driver = {332 .driver = {
333 .name = "leds-renesas-tpu",333 .name = "leds-renesas-tpu",
334 }334 }
drivers/leds/leds-ss4200.c+2−2
@@ -263,7 +263,7 @@ static int nasgpio_led_set_blink(struct led_classdev *led_cdev, · 262 unmodified lines
263 * already taken care of this, but we will do so in a non destructive manner263 * already taken care of this, but we will do so in a non destructive manner
264 * so that we have what we need whether the BIOS did it or not.264 * so that we have what we need whether the BIOS did it or not.
265 */265 */
266static int __devinit ich7_gpio_init(struct device *dev)266static int ich7_gpio_init(struct device *dev)
267{267{
268 int i;268 int i;
269 u32 config_data = 0;269 u32 config_data = 0;
@@ -342,7 +342,7 @@ static void ich7_lpc_cleanup(struct device *dev) · 72 unmodified lines
342 * so we can retrive the required operational information and prepare the GPIO.342 * so we can retrive the required operational information and prepare the GPIO.
343 */343 */
344static struct pci_dev *nas_gpio_pci_dev;344static struct pci_dev *nas_gpio_pci_dev;
345static int __devinit ich7_lpc_probe(struct pci_dev *dev,345static int ich7_lpc_probe(struct pci_dev *dev,
346 const struct pci_device_id *id)346 const struct pci_device_id *id)
347{347{
348 int status;348 int status;
drivers/leds/leds-sunfire.c+6−6
@@ -123,7 +123,7 @@ struct sunfire_drvdata { · 122 unmodified lines
123 struct sunfire_led leds[NUM_LEDS_PER_BOARD];123 struct sunfire_led leds[NUM_LEDS_PER_BOARD];
124};124};
125 125
126static int __devinit sunfire_led_generic_probe(struct platform_device *pdev,126static int sunfire_led_generic_probe(struct platform_device *pdev,
127 struct led_type *types)127 struct led_type *types)
128{128{
129 struct sunfire_drvdata *p;129 struct sunfire_drvdata *p;
@@ -165,7 +165,7 @@ static int __devinit sunfire_led_generic_probe(struct platform_device *pdev, · 35 unmodified lines
165 return 0;165 return 0;
166}166}
167 167
168static int __devexit sunfire_led_generic_remove(struct platform_device *pdev)168static int sunfire_led_generic_remove(struct platform_device *pdev)
169{169{
170 struct sunfire_drvdata *p = dev_get_drvdata(&pdev->dev);170 struct sunfire_drvdata *p = dev_get_drvdata(&pdev->dev);
171 int i;171 int i;
@@ -192,7 +192,7 @@ static struct led_type clockboard_led_types[NUM_LEDS_PER_BOARD] = { · 20 unmodified lines
192 },192 },
193};193};
194 194
195static int __devinit sunfire_clockboard_led_probe(struct platform_device *pdev)195static int sunfire_clockboard_led_probe(struct platform_device *pdev)
196{196{
197 return sunfire_led_generic_probe(pdev, clockboard_led_types);197 return sunfire_led_generic_probe(pdev, clockboard_led_types);
198}198}
@@ -213,7 +213,7 @@ static struct led_type fhc_led_types[NUM_LEDS_PER_BOARD] = { · 14 unmodified lines
213 },213 },
214};214};
215 215
216static int __devinit sunfire_fhc_led_probe(struct platform_device *pdev)216static int sunfire_fhc_led_probe(struct platform_device *pdev)
217{217{
218 return sunfire_led_generic_probe(pdev, fhc_led_types);218 return sunfire_led_generic_probe(pdev, fhc_led_types);
219}219}
@@ -223,7 +223,7 @@ MODULE_ALIAS("platform:sunfire-fhc-leds"); · 3 unmodified lines
223 223
224static struct platform_driver sunfire_clockboard_led_driver = {224static struct platform_driver sunfire_clockboard_led_driver = {
225 .probe = sunfire_clockboard_led_probe,225 .probe = sunfire_clockboard_led_probe,
226 .remove = __devexit_p(sunfire_led_generic_remove),226 .remove = sunfire_led_generic_remove,
227 .driver = {227 .driver = {
228 .name = "sunfire-clockboard-leds",228 .name = "sunfire-clockboard-leds",
229 .owner = THIS_MODULE,229 .owner = THIS_MODULE,
@@ -232,7 +232,7 @@ static struct platform_driver sunfire_clockboard_led_driver = { · 2 unmodified lines
232 232
233static struct platform_driver sunfire_fhc_led_driver = {233static struct platform_driver sunfire_fhc_led_driver = {
234 .probe = sunfire_fhc_led_probe,234 .probe = sunfire_fhc_led_probe,
235 .remove = __devexit_p(sunfire_led_generic_remove),235 .remove = sunfire_led_generic_remove,
236 .driver = {236 .driver = {
237 .name = "sunfire-fhc-leds",237 .name = "sunfire-fhc-leds",
238 .owner = THIS_MODULE,238 .owner = THIS_MODULE,
drivers/leds/leds-tca6507.c+3−3
@@ -667,7 +667,7 @@ static void tca6507_remove_gpio(struct tca6507_chip *tca) · 666 unmodified lines
667}667}
668#endif /* CONFIG_GPIOLIB */668#endif /* CONFIG_GPIOLIB */
669 669
670static int __devinit tca6507_probe(struct i2c_client *client,670static int tca6507_probe(struct i2c_client *client,
671 const struct i2c_device_id *id)671 const struct i2c_device_id *id)
672{672{
673 struct tca6507_chip *tca;673 struct tca6507_chip *tca;
@@ -730,7 +730,7 @@ exit: · 56 unmodified lines
730 return err;730 return err;
731}731}
732 732
733static int __devexit tca6507_remove(struct i2c_client *client)733static int tca6507_remove(struct i2c_client *client)
734{734{
735 int i;735 int i;
736 struct tca6507_chip *tca = i2c_get_clientdata(client);736 struct tca6507_chip *tca = i2c_get_clientdata(client);
@@ -752,7 +752,7 @@ static struct i2c_driver tca6507_driver = { · 15 unmodified lines
752 .owner = THIS_MODULE,752 .owner = THIS_MODULE,
753 },753 },
754 .probe = tca6507_probe,754 .probe = tca6507_probe,
755 .remove = __devexit_p(tca6507_remove),755 .remove = tca6507_remove,
756 .id_table = tca6507_id,756 .id_table = tca6507_id,
757};757};
758 758
drivers/mfd/88pm800.c+6−6
@@ -248,7 +248,7 @@ static const struct regmap_irq pm800_irqs[] = { · 247 unmodified lines
248 },248 },
249};249};
250 250
251static int __devinit device_gpadc_init(struct pm80x_chip *chip,251static int device_gpadc_init(struct pm80x_chip *chip,
252 struct pm80x_platform_data *pdata)252 struct pm80x_platform_data *pdata)
253{253{
254 struct pm80x_subchip *subchip = chip->subchip;254 struct pm80x_subchip *subchip = chip->subchip;
@@ -315,7 +315,7 @@ out: · 60 unmodified lines
315 return ret;315 return ret;
316}316}
317 317
318static int __devinit device_irq_init_800(struct pm80x_chip *chip)318static int device_irq_init_800(struct pm80x_chip *chip)
319{319{
320 struct regmap *map = chip->regmap;320 struct regmap *map = chip->regmap;
321 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;321 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
@@ -415,7 +415,7 @@ static void pm800_pages_exit(struct pm80x_chip *chip) · 93 unmodified lines
415 }415 }
416}416}
417 417
418static int __devinit device_800_init(struct pm80x_chip *chip,418static int device_800_init(struct pm80x_chip *chip,
419 struct pm80x_platform_data *pdata)419 struct pm80x_platform_data *pdata)
420{420{
421 int ret, pmic_id;421 int ret, pmic_id;
@@ -499,7 +499,7 @@ out: · 77 unmodified lines
499 return ret;499 return ret;
500}500}
501 501
502static int __devinit pm800_probe(struct i2c_client *client,502static int pm800_probe(struct i2c_client *client,
503 const struct i2c_device_id *id)503 const struct i2c_device_id *id)
504{504{
505 int ret = 0;505 int ret = 0;
@@ -554,7 +554,7 @@ out_init: · 48 unmodified lines
554 return ret;554 return ret;
555}555}
556 556
557static int __devexit pm800_remove(struct i2c_client *client)557static int pm800_remove(struct i2c_client *client)
558{558{
559 struct pm80x_chip *chip = i2c_get_clientdata(client);559 struct pm80x_chip *chip = i2c_get_clientdata(client);
560 560
@@ -576,7 +576,7 @@ static struct i2c_driver pm800_driver = { · 15 unmodified lines
576 .pm = &pm80x_pm_ops,576 .pm = &pm80x_pm_ops,
577 },577 },
578 .probe = pm800_probe,578 .probe = pm800_probe,
579 .remove = __devexit_p(pm800_remove),579 .remove = pm800_remove,
580 .id_table = pm80x_id_table,580 .id_table = pm80x_id_table,
581};581};
582 582
drivers/mfd/88pm805.c+5−5
@@ -135,7 +135,7 @@ static struct regmap_irq pm805_irqs[] = { · 134 unmodified lines
135 },135 },
136};136};
137 137
138static int __devinit device_irq_init_805(struct pm80x_chip *chip)138static int device_irq_init_805(struct pm80x_chip *chip)
139{139{
140 struct regmap *map = chip->regmap;140 struct regmap *map = chip->regmap;
141 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;141 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
@@ -189,7 +189,7 @@ static struct regmap_irq_chip pm805_irq_chip = { · 47 unmodified lines
189 .ack_base = PM805_INT_STATUS1,189 .ack_base = PM805_INT_STATUS1,
190};190};
191 191
192static int __devinit device_805_init(struct pm80x_chip *chip)192static int device_805_init(struct pm80x_chip *chip)
193{193{
194 int ret = 0;194 int ret = 0;
195 unsigned int val;195 unsigned int val;
@@ -232,7 +232,7 @@ out_irq_init: · 36 unmodified lines
232 return ret;232 return ret;
233}233}
234 234
235static int __devinit pm805_probe(struct i2c_client *client,235static int pm805_probe(struct i2c_client *client,
236 const struct i2c_device_id *id)236 const struct i2c_device_id *id)
237{237{
238 int ret = 0;238 int ret = 0;
@@ -262,7 +262,7 @@ out_init: · 23 unmodified lines
262 return ret;262 return ret;
263}263}
264 264
265static int __devexit pm805_remove(struct i2c_client *client)265static int pm805_remove(struct i2c_client *client)
266{266{
267 struct pm80x_chip *chip = i2c_get_clientdata(client);267 struct pm80x_chip *chip = i2c_get_clientdata(client);
268 268
@@ -281,7 +281,7 @@ static struct i2c_driver pm805_driver = { · 12 unmodified lines
281 .pm = &pm80x_pm_ops,281 .pm = &pm80x_pm_ops,
282 },282 },
283 .probe = pm805_probe,283 .probe = pm805_probe,
284 .remove = __devexit_p(pm805_remove),284 .remove = pm805_remove,
285 .id_table = pm80x_id_table,285 .id_table = pm80x_id_table,
286};286};
287 287
drivers/mfd/88pm80x.c+1−1
@@ -31,7 +31,7 @@ const struct regmap_config pm80x_regmap_config = { · 30 unmodified lines
31};31};
32EXPORT_SYMBOL_GPL(pm80x_regmap_config);32EXPORT_SYMBOL_GPL(pm80x_regmap_config);
33 33
34int __devinit pm80x_init(struct i2c_client *client,34int pm80x_init(struct i2c_client *client,
35 const struct i2c_device_id *id)35 const struct i2c_device_id *id)
36{36{
37 struct pm80x_chip *chip;37 struct pm80x_chip *chip;
drivers/mfd/88pm860x-core.c+52−52
@@ -28,111 +28,111 @@ · 27 unmodified lines
28 28
29#define INT_STATUS_NUM 329#define INT_STATUS_NUM 3
30 30
31static struct resource bk0_resources[] __devinitdata = {31static struct resource bk0_resources[] = {
32 {2, 2, "duty cycle", IORESOURCE_REG, },32 {2, 2, "duty cycle", IORESOURCE_REG, },
33 {3, 3, "always on", IORESOURCE_REG, },33 {3, 3, "always on", IORESOURCE_REG, },
34 {3, 3, "current", IORESOURCE_REG, },34 {3, 3, "current", IORESOURCE_REG, },
35};35};
36static struct resource bk1_resources[] __devinitdata = {36static struct resource bk1_resources[] = {
37 {4, 4, "duty cycle", IORESOURCE_REG, },37 {4, 4, "duty cycle", IORESOURCE_REG, },
38 {5, 5, "always on", IORESOURCE_REG, },38 {5, 5, "always on", IORESOURCE_REG, },
39 {5, 5, "current", IORESOURCE_REG, },39 {5, 5, "current", IORESOURCE_REG, },
40};40};
41static struct resource bk2_resources[] __devinitdata = {41static struct resource bk2_resources[] = {
42 {6, 6, "duty cycle", IORESOURCE_REG, },42 {6, 6, "duty cycle", IORESOURCE_REG, },
43 {7, 7, "always on", IORESOURCE_REG, },43 {7, 7, "always on", IORESOURCE_REG, },
44 {5, 5, "current", IORESOURCE_REG, },44 {5, 5, "current", IORESOURCE_REG, },
45};45};
46 46
47static struct resource led0_resources[] __devinitdata = {47static struct resource led0_resources[] = {
48 /* RGB1 Red LED */48 /* RGB1 Red LED */
49 {0xd, 0xd, "control", IORESOURCE_REG, },49 {0xd, 0xd, "control", IORESOURCE_REG, },
50 {0xc, 0xc, "blink", IORESOURCE_REG, },50 {0xc, 0xc, "blink", IORESOURCE_REG, },
51};51};
52static struct resource led1_resources[] __devinitdata = {52static struct resource led1_resources[] = {
53 /* RGB1 Green LED */53 /* RGB1 Green LED */
54 {0xe, 0xe, "control", IORESOURCE_REG, },54 {0xe, 0xe, "control", IORESOURCE_REG, },
55 {0xc, 0xc, "blink", IORESOURCE_REG, },55 {0xc, 0xc, "blink", IORESOURCE_REG, },
56};56};
57static struct resource led2_resources[] __devinitdata = {57static struct resource led2_resources[] = {
58 /* RGB1 Blue LED */58 /* RGB1 Blue LED */
59 {0xf, 0xf, "control", IORESOURCE_REG, },59 {0xf, 0xf, "control", IORESOURCE_REG, },
60 {0xc, 0xc, "blink", IORESOURCE_REG, },60 {0xc, 0xc, "blink", IORESOURCE_REG, },
61};61};
62static struct resource led3_resources[] __devinitdata = {62static struct resource led3_resources[] = {
63 /* RGB2 Red LED */63 /* RGB2 Red LED */
64 {0x9, 0x9, "control", IORESOURCE_REG, },64 {0x9, 0x9, "control", IORESOURCE_REG, },
65 {0x8, 0x8, "blink", IORESOURCE_REG, },65 {0x8, 0x8, "blink", IORESOURCE_REG, },
66};66};
67static struct resource led4_resources[] __devinitdata = {67static struct resource led4_resources[] = {
68 /* RGB2 Green LED */68 /* RGB2 Green LED */
69 {0xa, 0xa, "control", IORESOURCE_REG, },69 {0xa, 0xa, "control", IORESOURCE_REG, },
70 {0x8, 0x8, "blink", IORESOURCE_REG, },70 {0x8, 0x8, "blink", IORESOURCE_REG, },
71};71};
72static struct resource led5_resources[] __devinitdata = {72static struct resource led5_resources[] = {
73 /* RGB2 Blue LED */73 /* RGB2 Blue LED */
74 {0xb, 0xb, "control", IORESOURCE_REG, },74 {0xb, 0xb, "control", IORESOURCE_REG, },
75 {0x8, 0x8, "blink", IORESOURCE_REG, },75 {0x8, 0x8, "blink", IORESOURCE_REG, },
76};76};
77 77
78static struct resource buck1_resources[] __devinitdata = {78static struct resource buck1_resources[] = {
79 {0x24, 0x24, "buck set", IORESOURCE_REG, },79 {0x24, 0x24, "buck set", IORESOURCE_REG, },
80};80};
81static struct resource buck2_resources[] __devinitdata = {81static struct resource buck2_resources[] = {
82 {0x25, 0x25, "buck set", IORESOURCE_REG, },82 {0x25, 0x25, "buck set", IORESOURCE_REG, },
83};83};
84static struct resource buck3_resources[] __devinitdata = {84static struct resource buck3_resources[] = {
85 {0x26, 0x26, "buck set", IORESOURCE_REG, },85 {0x26, 0x26, "buck set", IORESOURCE_REG, },
86};86};
87static struct resource ldo1_resources[] __devinitdata = {87static struct resource ldo1_resources[] = {
88 {0x10, 0x10, "ldo set", IORESOURCE_REG, },88 {0x10, 0x10, "ldo set", IORESOURCE_REG, },
89};89};
90static struct resource ldo2_resources[] __devinitdata = {90static struct resource ldo2_resources[] = {
91 {0x11, 0x11, "ldo set", IORESOURCE_REG, },91 {0x11, 0x11, "ldo set", IORESOURCE_REG, },
92};92};
93static struct resource ldo3_resources[] __devinitdata = {93static struct resource ldo3_resources[] = {
94 {0x12, 0x12, "ldo set", IORESOURCE_REG, },94 {0x12, 0x12, "ldo set", IORESOURCE_REG, },
95};95};
96static struct resource ldo4_resources[] __devinitdata = {96static struct resource ldo4_resources[] = {
97 {0x13, 0x13, "ldo set", IORESOURCE_REG, },97 {0x13, 0x13, "ldo set", IORESOURCE_REG, },
98};98};
99static struct resource ldo5_resources[] __devinitdata = {99static struct resource ldo5_resources[] = {
100 {0x14, 0x14, "ldo set", IORESOURCE_REG, },100 {0x14, 0x14, "ldo set", IORESOURCE_REG, },
101};101};
102static struct resource ldo6_resources[] __devinitdata = {102static struct resource ldo6_resources[] = {
103 {0x15, 0x15, "ldo set", IORESOURCE_REG, },103 {0x15, 0x15, "ldo set", IORESOURCE_REG, },
104};104};
105static struct resource ldo7_resources[] __devinitdata = {105static struct resource ldo7_resources[] = {
106 {0x16, 0x16, "ldo set", IORESOURCE_REG, },106 {0x16, 0x16, "ldo set", IORESOURCE_REG, },
107};107};
108static struct resource ldo8_resources[] __devinitdata = {108static struct resource ldo8_resources[] = {
109 {0x17, 0x17, "ldo set", IORESOURCE_REG, },109 {0x17, 0x17, "ldo set", IORESOURCE_REG, },
110};110};
111static struct resource ldo9_resources[] __devinitdata = {111static struct resource ldo9_resources[] = {
112 {0x18, 0x18, "ldo set", IORESOURCE_REG, },112 {0x18, 0x18, "ldo set", IORESOURCE_REG, },
113};113};
114static struct resource ldo10_resources[] __devinitdata = {114static struct resource ldo10_resources[] = {
115 {0x19, 0x19, "ldo set", IORESOURCE_REG, },115 {0x19, 0x19, "ldo set", IORESOURCE_REG, },
116};116};
117static struct resource ldo12_resources[] __devinitdata = {117static struct resource ldo12_resources[] = {
118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },
119};119};
120static struct resource ldo_vibrator_resources[] __devinitdata = {120static struct resource ldo_vibrator_resources[] = {
121 {0x28, 0x28, "ldo set", IORESOURCE_REG, },121 {0x28, 0x28, "ldo set", IORESOURCE_REG, },
122};122};
123static struct resource ldo14_resources[] __devinitdata = {123static struct resource ldo14_resources[] = {
124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },
125};125};
126 126
127static struct resource touch_resources[] __devinitdata = {127static struct resource touch_resources[] = {
128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},
129};129};
130 130
131static struct resource onkey_resources[] __devinitdata = {131static struct resource onkey_resources[] = {
132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},
133};133};
134 134
135static struct resource codec_resources[] __devinitdata = {135static struct resource codec_resources[] = {
136 /* Headset microphone insertion or removal */136 /* Headset microphone insertion or removal */
137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,},137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,},
138 /* Hook-switch press or release */138 /* Hook-switch press or release */
@@ -143,12 +143,12 @@ static struct resource codec_resources[] __devinitdata = { · 4 unmodified lines
143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},
144};144};
145 145
146static struct resource battery_resources[] __devinitdata = {146static struct resource battery_resources[] = {
147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,},147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,},
148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,},148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,},
149};149};
150 150
151static struct resource charger_resources[] __devinitdata = {151static struct resource charger_resources[] = {
152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,},152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,},
153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},
154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,},154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,},
@@ -158,11 +158,11 @@ static struct resource charger_resources[] __devinitdata = { · 3 unmodified lines
158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
159};159};
160 160
161static struct resource rtc_resources[] __devinitdata = {161static struct resource rtc_resources[] = {
162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
163};163};
164 164
165static struct mfd_cell bk_devs[] __devinitdata = {165static struct mfd_cell bk_devs[] = {
166 {166 {
167 .name = "88pm860x-backlight",167 .name = "88pm860x-backlight",
168 .id = 0,168 .id = 0,
@@ -181,7 +181,7 @@ static struct mfd_cell bk_devs[] __devinitdata = { · 12 unmodified lines
181 },181 },
182};182};
183 183
184static struct mfd_cell led_devs[] __devinitdata = {184static struct mfd_cell led_devs[] = {
185 {185 {
186 .name = "88pm860x-led",186 .name = "88pm860x-led",
187 .id = 0,187 .id = 0,
@@ -215,7 +215,7 @@ static struct mfd_cell led_devs[] __devinitdata = { · 27 unmodified lines
215 },215 },
216};216};
217 217
218static struct mfd_cell reg_devs[] __devinitdata = {218static struct mfd_cell reg_devs[] = {
219 {219 {
220 .name = "88pm860x-regulator",220 .name = "88pm860x-regulator",
221 .id = 0,221 .id = 0,
@@ -565,7 +565,7 @@ static struct irq_domain_ops pm860x_irq_domain_ops = { · 343 unmodified lines
565 .xlate = irq_domain_xlate_onetwocell,565 .xlate = irq_domain_xlate_onetwocell,
566};566};
567 567
568static int __devinit device_irq_init(struct pm860x_chip *chip,568static int device_irq_init(struct pm860x_chip *chip,
569 struct pm860x_platform_data *pdata)569 struct pm860x_platform_data *pdata)
570{570{
571 struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \571 struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
@@ -730,7 +730,7 @@ out: · 158 unmodified lines
730}730}
731EXPORT_SYMBOL(pm8606_osc_disable);731EXPORT_SYMBOL(pm8606_osc_disable);
732 732
733static void __devinit device_osc_init(struct i2c_client *i2c)733static void device_osc_init(struct i2c_client *i2c)
734{734{
735 struct pm860x_chip *chip = i2c_get_clientdata(i2c);735 struct pm860x_chip *chip = i2c_get_clientdata(i2c);
736 736
@@ -745,7 +745,7 @@ static void __devinit device_osc_init(struct i2c_client *i2c) · 8 unmodified lines
745 chip->osc_status = PM8606_REF_GP_OSC_OFF;745 chip->osc_status = PM8606_REF_GP_OSC_OFF;
746}746}
747 747
748static void __devinit device_bk_init(struct pm860x_chip *chip,748static void device_bk_init(struct pm860x_chip *chip,
749 struct pm860x_platform_data *pdata)749 struct pm860x_platform_data *pdata)
750{750{
751 int ret, i;751 int ret, i;
@@ -765,7 +765,7 @@ static void __devinit device_bk_init(struct pm860x_chip *chip, · 13 unmodified lines
765 dev_err(chip->dev, "Failed to add backlight subdev\n");765 dev_err(chip->dev, "Failed to add backlight subdev\n");
766}766}
767 767
768static void __devinit device_led_init(struct pm860x_chip *chip,768static void device_led_init(struct pm860x_chip *chip,
769 struct pm860x_platform_data *pdata)769 struct pm860x_platform_data *pdata)
770{770{
771 int ret, i;771 int ret, i;
@@ -787,7 +787,7 @@ static void __devinit device_led_init(struct pm860x_chip *chip, · 15 unmodified lines
787 }787 }
788}788}
789 789
790static void __devinit device_regulator_init(struct pm860x_chip *chip,790static void device_regulator_init(struct pm860x_chip *chip,
791 struct pm860x_platform_data *pdata)791 struct pm860x_platform_data *pdata)
792{792{
793 int ret;793 int ret;
@@ -866,7 +866,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip, · 72 unmodified lines
866 }866 }
867}867}
868 868
869static void __devinit device_rtc_init(struct pm860x_chip *chip,869static void device_rtc_init(struct pm860x_chip *chip,
870 struct pm860x_platform_data *pdata)870 struct pm860x_platform_data *pdata)
871{871{
872 int ret;872 int ret;
@@ -885,7 +885,7 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip, · 12 unmodified lines
885 dev_err(chip->dev, "Failed to add rtc subdev\n");885 dev_err(chip->dev, "Failed to add rtc subdev\n");
886}886}
887 887
888static void __devinit device_touch_init(struct pm860x_chip *chip,888static void device_touch_init(struct pm860x_chip *chip,
889 struct pm860x_platform_data *pdata)889 struct pm860x_platform_data *pdata)
890{890{
891 int ret;891 int ret;
@@ -904,7 +904,7 @@ static void __devinit device_touch_init(struct pm860x_chip *chip, · 12 unmodified lines
904 dev_err(chip->dev, "Failed to add touch subdev\n");904 dev_err(chip->dev, "Failed to add touch subdev\n");
905}905}
906 906
907static void __devinit device_power_init(struct pm860x_chip *chip,907static void device_power_init(struct pm860x_chip *chip,
908 struct pm860x_platform_data *pdata)908 struct pm860x_platform_data *pdata)
909{909{
910 int ret;910 int ret;
@@ -951,7 +951,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, · 40 unmodified lines
951 }951 }
952}952}
953 953
954static void __devinit device_onkey_init(struct pm860x_chip *chip,954static void device_onkey_init(struct pm860x_chip *chip,
955 struct pm860x_platform_data *pdata)955 struct pm860x_platform_data *pdata)
956{956{
957 int ret;957 int ret;
@@ -965,7 +965,7 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip, · 7 unmodified lines
965 dev_err(chip->dev, "Failed to add onkey subdev\n");965 dev_err(chip->dev, "Failed to add onkey subdev\n");
966}966}
967 967
968static void __devinit device_codec_init(struct pm860x_chip *chip,968static void device_codec_init(struct pm860x_chip *chip,
969 struct pm860x_platform_data *pdata)969 struct pm860x_platform_data *pdata)
970{970{
971 int ret;971 int ret;
@@ -979,7 +979,7 @@ static void __devinit device_codec_init(struct pm860x_chip *chip, · 7 unmodified lines
979 dev_err(chip->dev, "Failed to add codec subdev\n");979 dev_err(chip->dev, "Failed to add codec subdev\n");
980}980}
981 981
982static void __devinit device_8607_init(struct pm860x_chip *chip,982static void device_8607_init(struct pm860x_chip *chip,
983 struct i2c_client *i2c,983 struct i2c_client *i2c,
984 struct pm860x_platform_data *pdata)984 struct pm860x_platform_data *pdata)
985{985{
@@ -1040,7 +1040,7 @@ out: · 54 unmodified lines
1040 return;1040 return;
1041}1041}
1042 1042
1043static void __devinit device_8606_init(struct pm860x_chip *chip,1043static void device_8606_init(struct pm860x_chip *chip,
1044 struct i2c_client *i2c,1044 struct i2c_client *i2c,
1045 struct pm860x_platform_data *pdata)1045 struct pm860x_platform_data *pdata)
1046{1046{
@@ -1049,7 +1049,7 @@ static void __devinit device_8606_init(struct pm860x_chip *chip, · 2 unmodified lines
1049 device_led_init(chip, pdata);1049 device_led_init(chip, pdata);
1050}1050}
1051 1051
1052static int __devinit pm860x_device_init(struct pm860x_chip *chip,1052static int pm860x_device_init(struct pm860x_chip *chip,
1053 struct pm860x_platform_data *pdata)1053 struct pm860x_platform_data *pdata)
1054{1054{
1055 chip->core_irq = 0;1055 chip->core_irq = 0;
@@ -1077,7 +1077,7 @@ static int __devinit pm860x_device_init(struct pm860x_chip *chip, · 21 unmodified lines
1077 return 0;1077 return 0;
1078}1078}
1079 1079
1080static void __devexit pm860x_device_exit(struct pm860x_chip *chip)1080static void pm860x_device_exit(struct pm860x_chip *chip)
1081{1081{
1082 device_irq_exit(chip);1082 device_irq_exit(chip);
1083 mfd_remove_devices(chip->dev);1083 mfd_remove_devices(chip->dev);
@@ -1109,7 +1109,7 @@ static struct regmap_config pm860x_regmap_config = { · 25 unmodified lines
1109 .val_bits = 8,1109 .val_bits = 8,
1110};1110};
1111 1111
1112static int __devinit pm860x_dt_init(struct device_node *np,1112static int pm860x_dt_init(struct device_node *np,
1113 struct device *dev,1113 struct device *dev,
1114 struct pm860x_platform_data *pdata)1114 struct pm860x_platform_data *pdata)
1115{1115{
@@ -1127,7 +1127,7 @@ static int __devinit pm860x_dt_init(struct device_node *np, · 11 unmodified lines
1127 return 0;1127 return 0;
1128}1128}
1129 1129
1130static int __devinit pm860x_probe(struct i2c_client *client,1130static int pm860x_probe(struct i2c_client *client,
1131 const struct i2c_device_id *id)1131 const struct i2c_device_id *id)
1132{1132{
1133 struct pm860x_platform_data *pdata = client->dev.platform_data;1133 struct pm860x_platform_data *pdata = client->dev.platform_data;
@@ -1200,7 +1200,7 @@ err: · 66 unmodified lines
1200 return ret;1200 return ret;
1201}1201}
1202 1202
1203static int __devexit pm860x_remove(struct i2c_client *client)1203static int pm860x_remove(struct i2c_client *client)
1204{1204{
1205 struct pm860x_chip *chip = i2c_get_clientdata(client);1205 struct pm860x_chip *chip = i2c_get_clientdata(client);
1206 1206
@@ -1258,7 +1258,7 @@ static struct i2c_driver pm860x_driver = { · 51 unmodified lines
1258 .of_match_table = of_match_ptr(pm860x_dt_ids),1258 .of_match_table = of_match_ptr(pm860x_dt_ids),
1259 },1259 },
1260 .probe = pm860x_probe,1260 .probe = pm860x_probe,
1261 .remove = __devexit_p(pm860x_remove),1261 .remove = pm860x_remove,
1262 .id_table = pm860x_id_table,1262 .id_table = pm860x_id_table,
1263};1263};
1264 1264
drivers/mfd/ab3100-core.c+6−7
@@ -661,8 +661,7 @@ struct ab3100_init_setting { · 660 unmodified lines
661 u8 setting;661 u8 setting;
662};662};
663 663
664static const struct ab3100_init_setting __devinitconst664static const struct ab3100_init_setting ab3100_init_settings[] = {
665ab3100_init_settings[] = {
666 {665 {
667 .abreg = AB3100_MCA,666 .abreg = AB3100_MCA,
668 .setting = 0x01667 .setting = 0x01
@@ -708,7 +707,7 @@ ab3100_init_settings[] = { · 39 unmodified lines
708 },707 },
709};708};
710 709
711static int __devinit ab3100_setup(struct ab3100 *ab3100)710static int ab3100_setup(struct ab3100 *ab3100)
712{711{
713 int err = 0;712 int err = 0;
714 int i;713 int i;
@@ -803,7 +802,7 @@ struct ab_family_id { · 88 unmodified lines
803 char *name;802 char *name;
804};803};
805 804
806static const struct ab_family_id ids[] __devinitconst = {805static const struct ab_family_id ids[] = {
807 /* AB3100 */806 /* AB3100 */
808 {807 {
809 .id = 0xc0,808 .id = 0xc0,
@@ -857,7 +856,7 @@ static const struct ab_family_id ids[] __devinitconst = { · 47 unmodified lines
857 },856 },
858};857};
859 858
860static int __devinit ab3100_probe(struct i2c_client *client,859static int ab3100_probe(struct i2c_client *client,
861 const struct i2c_device_id *id)860 const struct i2c_device_id *id)
862{861{
863 struct ab3100 *ab3100;862 struct ab3100 *ab3100;
@@ -962,7 +961,7 @@ static int __devinit ab3100_probe(struct i2c_client *client, · 98 unmodified lines
962 return err;961 return err;
963}962}
964 963
965static int __devexit ab3100_remove(struct i2c_client *client)964static int ab3100_remove(struct i2c_client *client)
966{965{
967 struct ab3100 *ab3100 = i2c_get_clientdata(client);966 struct ab3100 *ab3100 = i2c_get_clientdata(client);
968 967
@@ -986,7 +985,7 @@ static struct i2c_driver ab3100_driver = { · 17 unmodified lines
986 },985 },
987 .id_table = ab3100_id,986 .id_table = ab3100_id,
988 .probe = ab3100_probe,987 .probe = ab3100_probe,
989 .remove = __devexit_p(ab3100_remove),988 .remove = ab3100_remove,
990};989};
991 990
992static int __init ab3100_i2c_init(void)991static int __init ab3100_i2c_init(void)
drivers/mfd/ab8500-core.c+20−20
@@ -623,7 +623,7 @@ static struct resource __devinitdata ab9540_gpio_resources[] = { · 622 unmodified lines
623 }623 }
624};624};
625 625
626static struct resource __devinitdata ab8500_gpadc_resources[] = {626static struct resource ab8500_gpadc_resources[] = {
627 {627 {
628 .name = "HW_CONV_END",628 .name = "HW_CONV_END",
629 .start = AB8500_INT_GP_HW_ADC_CONV_END,629 .start = AB8500_INT_GP_HW_ADC_CONV_END,
@@ -638,7 +638,7 @@ static struct resource __devinitdata ab8500_gpadc_resources[] = { · 8 unmodified lines
638 },638 },
639};639};
640 640
641static struct resource __devinitdata ab8500_rtc_resources[] = {641static struct resource ab8500_rtc_resources[] = {
642 {642 {
643 .name = "60S",643 .name = "60S",
644 .start = AB8500_INT_RTC_60S,644 .start = AB8500_INT_RTC_60S,
@@ -653,7 +653,7 @@ static struct resource __devinitdata ab8500_rtc_resources[] = { · 8 unmodified lines
653 },653 },
654};654};
655 655
656static struct resource __devinitdata ab8500_poweronkey_db_resources[] = {656static struct resource ab8500_poweronkey_db_resources[] = {
657 {657 {
658 .name = "ONKEY_DBF",658 .name = "ONKEY_DBF",
659 .start = AB8500_INT_PON_KEY1DB_F,659 .start = AB8500_INT_PON_KEY1DB_F,
@@ -668,7 +668,7 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = { · 8 unmodified lines
668 },668 },
669};669};
670 670
671static struct resource __devinitdata ab8500_av_acc_detect_resources[] = {671static struct resource ab8500_av_acc_detect_resources[] = {
672 {672 {
673 .name = "ACC_DETECT_1DB_F",673 .name = "ACC_DETECT_1DB_F",
674 .start = AB8500_INT_ACC_DETECT_1DB_F,674 .start = AB8500_INT_ACC_DETECT_1DB_F,
@@ -707,7 +707,7 @@ static struct resource __devinitdata ab8500_av_acc_detect_resources[] = { · 32 unmodified lines
707 },707 },
708};708};
709 709
710static struct resource __devinitdata ab8500_charger_resources[] = {710static struct resource ab8500_charger_resources[] = {
711 {711 {
712 .name = "MAIN_CH_UNPLUG_DET",712 .name = "MAIN_CH_UNPLUG_DET",
713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET,713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
@@ -788,7 +788,7 @@ static struct resource __devinitdata ab8500_charger_resources[] = { · 74 unmodified lines
788 },788 },
789};789};
790 790
791static struct resource __devinitdata ab8500_btemp_resources[] = {791static struct resource ab8500_btemp_resources[] = {
792 {792 {
793 .name = "BAT_CTRL_INDB",793 .name = "BAT_CTRL_INDB",
794 .start = AB8500_INT_BAT_CTRL_INDB,794 .start = AB8500_INT_BAT_CTRL_INDB,
@@ -821,7 +821,7 @@ static struct resource __devinitdata ab8500_btemp_resources[] = { · 26 unmodified lines
821 },821 },
822};822};
823 823
824static struct resource __devinitdata ab8500_fg_resources[] = {824static struct resource ab8500_fg_resources[] = {
825 {825 {
826 .name = "NCONV_ACCU",826 .name = "NCONV_ACCU",
827 .start = AB8500_INT_CCN_CONV_ACC,827 .start = AB8500_INT_CCN_CONV_ACC,
@@ -860,10 +860,10 @@ static struct resource __devinitdata ab8500_fg_resources[] = { · 32 unmodified lines
860 },860 },
861};861};
862 862
863static struct resource __devinitdata ab8500_chargalg_resources[] = {};863static struct resource ab8500_chargalg_resources[] = {};
864 864
865#ifdef CONFIG_DEBUG_FS865#ifdef CONFIG_DEBUG_FS
866static struct resource __devinitdata ab8500_debug_resources[] = {866static struct resource ab8500_debug_resources[] = {
867 {867 {
868 .name = "IRQ_FIRST",868 .name = "IRQ_FIRST",
869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
@@ -879,7 +879,7 @@ static struct resource __devinitdata ab8500_debug_resources[] = { · 9 unmodified lines
879};879};
880#endif880#endif
881 881
882static struct resource __devinitdata ab8500_usb_resources[] = {882static struct resource ab8500_usb_resources[] = {
883 {883 {
884 .name = "ID_WAKEUP_R",884 .name = "ID_WAKEUP_R",
885 .start = AB8500_INT_ID_WAKEUP_R,885 .start = AB8500_INT_ID_WAKEUP_R,
@@ -924,7 +924,7 @@ static struct resource __devinitdata ab8500_usb_resources[] = { · 38 unmodified lines
924 },924 },
925};925};
926 926
927static struct resource __devinitdata ab8505_iddet_resources[] = {927static struct resource ab8505_iddet_resources[] = {
928 {928 {
929 .name = "KeyDeglitch",929 .name = "KeyDeglitch",
930 .start = AB8505_INT_KEYDEGLITCH,930 .start = AB8505_INT_KEYDEGLITCH,
@@ -957,7 +957,7 @@ static struct resource __devinitdata ab8505_iddet_resources[] = { · 26 unmodified lines
957 },957 },
958};958};
959 959
960static struct resource __devinitdata ab8500_temp_resources[] = {960static struct resource ab8500_temp_resources[] = {
961 {961 {
962 .name = "AB8500_TEMP_WARM",962 .name = "AB8500_TEMP_WARM",
963 .start = AB8500_INT_TEMP_WARM,963 .start = AB8500_INT_TEMP_WARM,
@@ -966,7 +966,7 @@ static struct resource __devinitdata ab8500_temp_resources[] = { · 2 unmodified lines
966 },966 },
967};967};
968 968
969static struct mfd_cell __devinitdata abx500_common_devs[] = {969static struct mfd_cell abx500_common_devs[] = {
970#ifdef CONFIG_DEBUG_FS970#ifdef CONFIG_DEBUG_FS
971 {971 {
972 .name = "ab8500-debug",972 .name = "ab8500-debug",
@@ -1038,7 +1038,7 @@ static struct mfd_cell __devinitdata abx500_common_devs[] = { · 65 unmodified lines
1038 },1038 },
1039};1039};
1040 1040
1041static struct mfd_cell __devinitdata ab8500_bm_devs[] = {1041static struct mfd_cell ab8500_bm_devs[] = {
1042 {1042 {
1043 .name = "ab8500-charger",1043 .name = "ab8500-charger",
1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources),1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources),
@@ -1061,7 +1061,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = { · 16 unmodified lines
1061 },1061 },
1062};1062};
1063 1063
1064static struct mfd_cell __devinitdata ab8500_devs[] = {1064static struct mfd_cell ab8500_devs[] = {
1065 {1065 {
1066 .name = "ab8500-gpio",1066 .name = "ab8500-gpio",
1067 .of_compatible = "stericsson,ab8500-gpio",1067 .of_compatible = "stericsson,ab8500-gpio",
@@ -1080,7 +1080,7 @@ static struct mfd_cell __devinitdata ab8500_devs[] = { · 12 unmodified lines
1080 },1080 },
1081};1081};
1082 1082
1083static struct mfd_cell __devinitdata ab9540_devs[] = {1083static struct mfd_cell ab9540_devs[] = {
1084 {1084 {
1085 .name = "ab8500-gpio",1085 .name = "ab8500-gpio",
1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources),1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources),
@@ -1097,7 +1097,7 @@ static struct mfd_cell __devinitdata ab9540_devs[] = { · 10 unmodified lines
1097};1097};
1098 1098
1099/* Device list common to ab9540 and ab8505 */1099/* Device list common to ab9540 and ab8505 */
1100static struct mfd_cell __devinitdata ab9540_ab8505_devs[] = {1100static struct mfd_cell ab9540_ab8505_devs[] = {
1101 {1101 {
1102 .name = "ab-iddet",1102 .name = "ab-iddet",
1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
@@ -1248,7 +1248,7 @@ static struct attribute_group ab9540_attr_group = { · 144 unmodified lines
1248 .attrs = ab9540_sysfs_entries,1248 .attrs = ab9540_sysfs_entries,
1249};1249};
1250 1250
1251static int __devinit ab8500_probe(struct platform_device *pdev)1251static int ab8500_probe(struct platform_device *pdev)
1252{1252{
1253 static char *switch_off_status[] = {1253 static char *switch_off_status[] = {
1254 "Swoff bit programming",1254 "Swoff bit programming",
@@ -1473,7 +1473,7 @@ out_free_ab8500: · 218 unmodified lines
1473 return ret;1473 return ret;
1474}1474}
1475 1475
1476static int __devexit ab8500_remove(struct platform_device *pdev)1476static int ab8500_remove(struct platform_device *pdev)
1477{1477{
1478 struct ab8500 *ab8500 = platform_get_drvdata(pdev);1478 struct ab8500 *ab8500 = platform_get_drvdata(pdev);
1479 1479
@@ -1506,7 +1506,7 @@ static struct platform_driver ab8500_core_driver = { · 26 unmodified lines
1506 .owner = THIS_MODULE,1506 .owner = THIS_MODULE,
1507 },1507 },
1508 .probe = ab8500_probe,1508 .probe = ab8500_probe,
1509 .remove = __devexit_p(ab8500_remove),1509 .remove = ab8500_remove,
1510 .id_table = ab8500_id,1510 .id_table = ab8500_id,
1511};1511};
1512 1512
drivers/mfd/ab8500-debugfs.c+3−3
@@ -552,7 +552,7 @@ static struct dentry *ab8500_bank_file; · 551 unmodified lines
552static struct dentry *ab8500_address_file;552static struct dentry *ab8500_address_file;
553static struct dentry *ab8500_val_file;553static struct dentry *ab8500_val_file;
554 554
555static int __devinit ab8500_debug_probe(struct platform_device *plf)555static int ab8500_debug_probe(struct platform_device *plf)
556{556{
557 debug_bank = AB8500_MISC;557 debug_bank = AB8500_MISC;
558 debug_address = AB8500_REV_REG & 0x00FF;558 debug_address = AB8500_REV_REG & 0x00FF;
@@ -597,7 +597,7 @@ exit_no_debugfs: · 38 unmodified lines
597 return -ENOMEM;597 return -ENOMEM;
598}598}
599 599
600static int __devexit ab8500_debug_remove(struct platform_device *plf)600static int ab8500_debug_remove(struct platform_device *plf)
601{601{
602 debugfs_remove(ab8500_val_file);602 debugfs_remove(ab8500_val_file);
603 debugfs_remove(ab8500_address_file);603 debugfs_remove(ab8500_address_file);
@@ -614,7 +614,7 @@ static struct platform_driver ab8500_debug_driver = { · 10 unmodified lines
614 .owner = THIS_MODULE,614 .owner = THIS_MODULE,
615 },615 },
616 .probe = ab8500_debug_probe,616 .probe = ab8500_debug_probe,
617 .remove = __devexit_p(ab8500_debug_remove)617 .remove = ab8500_debug_remove
618};618};
619 619
620static int __init ab8500_debug_init(void)620static int __init ab8500_debug_init(void)
drivers/mfd/ab8500-gpadc.c+3−3
@@ -571,7 +571,7 @@ static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc) · 570 unmodified lines
571 gpadc->cal_data[ADC_INPUT_VBAT].offset);571 gpadc->cal_data[ADC_INPUT_VBAT].offset);
572}572}
573 573
574static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)574static int ab8500_gpadc_probe(struct platform_device *pdev)
575{575{
576 int ret = 0;576 int ret = 0;
577 struct ab8500_gpadc *gpadc;577 struct ab8500_gpadc *gpadc;
@@ -634,7 +634,7 @@ fail: · 56 unmodified lines
634 return ret;634 return ret;
635}635}
636 636
637static int __devexit ab8500_gpadc_remove(struct platform_device *pdev)637static int ab8500_gpadc_remove(struct platform_device *pdev)
638{638{
639 struct ab8500_gpadc *gpadc = platform_get_drvdata(pdev);639 struct ab8500_gpadc *gpadc = platform_get_drvdata(pdev);
640 640
@@ -651,7 +651,7 @@ static int __devexit ab8500_gpadc_remove(struct platform_device *pdev) · 10 unmodified lines
651 651
652static struct platform_driver ab8500_gpadc_driver = {652static struct platform_driver ab8500_gpadc_driver = {
653 .probe = ab8500_gpadc_probe,653 .probe = ab8500_gpadc_probe,
654 .remove = __devexit_p(ab8500_gpadc_remove),654 .remove = ab8500_gpadc_remove,
655 .driver = {655 .driver = {
656 .name = "ab8500-gpadc",656 .name = "ab8500-gpadc",
657 .owner = THIS_MODULE,657 .owner = THIS_MODULE,
drivers/mfd/ab8500-sysctrl.c+3−3
@@ -49,13 +49,13 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) · 48 unmodified lines
49 (u8)(reg & 0xFF), mask, value);49 (u8)(reg & 0xFF), mask, value);
50}50}
51 51
52static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)52static int ab8500_sysctrl_probe(struct platform_device *pdev)
53{53{
54 sysctrl_dev = &pdev->dev;54 sysctrl_dev = &pdev->dev;
55 return 0;55 return 0;
56}56}
57 57
58static int __devexit ab8500_sysctrl_remove(struct platform_device *pdev)58static int ab8500_sysctrl_remove(struct platform_device *pdev)
59{59{
60 sysctrl_dev = NULL;60 sysctrl_dev = NULL;
61 return 0;61 return 0;
@@ -67,7 +67,7 @@ static struct platform_driver ab8500_sysctrl_driver = { · 5 unmodified lines
67 .owner = THIS_MODULE,67 .owner = THIS_MODULE,
68 },68 },
69 .probe = ab8500_sysctrl_probe,69 .probe = ab8500_sysctrl_probe,
70 .remove = __devexit_p(ab8500_sysctrl_remove),70 .remove = ab8500_sysctrl_remove,
71};71};
72 72
73static int __init ab8500_sysctrl_init(void)73static int __init ab8500_sysctrl_init(void)
drivers/mfd/adp5520.c+3−3
@@ -203,7 +203,7 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip) · 202 unmodified lines
203 return device_for_each_child(chip->dev, NULL, __remove_subdev);203 return device_for_each_child(chip->dev, NULL, __remove_subdev);
204}204}
205 205
206static int __devinit adp5520_probe(struct i2c_client *client,206static int adp5520_probe(struct i2c_client *client,
207 const struct i2c_device_id *id)207 const struct i2c_device_id *id)
208{208{
209 struct adp5520_platform_data *pdata = client->dev.platform_data;209 struct adp5520_platform_data *pdata = client->dev.platform_data;
@@ -307,7 +307,7 @@ out_free_chip: · 97 unmodified lines
307 return ret;307 return ret;
308}308}
309 309
310static int __devexit adp5520_remove(struct i2c_client *client)310static int adp5520_remove(struct i2c_client *client)
311{311{
312 struct adp5520_chip *chip = dev_get_drvdata(&client->dev);312 struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
313 313
@@ -356,7 +356,7 @@ static struct i2c_driver adp5520_driver = { · 42 unmodified lines
356 .pm = &adp5520_pm,356 .pm = &adp5520_pm,
357 },357 },
358 .probe = adp5520_probe,358 .probe = adp5520_probe,
359 .remove = __devexit_p(adp5520_remove),359 .remove = adp5520_remove,
360 .id_table = adp5520_id,360 .id_table = adp5520_id,
361};361};
362 362
drivers/mfd/arizona-core.c+2−2
@@ -285,7 +285,7 @@ static struct mfd_cell wm5110_devs[] = { · 284 unmodified lines
285 { .name = "wm5110-codec" },285 { .name = "wm5110-codec" },
286};286};
287 287
288int __devinit arizona_dev_init(struct arizona *arizona)288int arizona_dev_init(struct arizona *arizona)
289{289{
290 struct device *dev = arizona->dev;290 struct device *dev = arizona->dev;
291 const char *type_name;291 const char *type_name;
@@ -561,7 +561,7 @@ err_early: · 269 unmodified lines
561}561}
562EXPORT_SYMBOL_GPL(arizona_dev_init);562EXPORT_SYMBOL_GPL(arizona_dev_init);
563 563
564int __devexit arizona_dev_exit(struct arizona *arizona)564int arizona_dev_exit(struct arizona *arizona)
565{565{
566 mfd_remove_devices(arizona->dev);566 mfd_remove_devices(arizona->dev);
567 arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);567 arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);
drivers/mfd/arizona-i2c.c+3−3
@@ -22,7 +22,7 @@ · 21 unmodified lines
22 22
23#include "arizona.h"23#include "arizona.h"
24 24
25static __devinit int arizona_i2c_probe(struct i2c_client *i2c,25static int arizona_i2c_probe(struct i2c_client *i2c,
26 const struct i2c_device_id *id)26 const struct i2c_device_id *id)
27{27{
28 struct arizona *arizona;28 struct arizona *arizona;
@@ -65,7 +65,7 @@ static __devinit int arizona_i2c_probe(struct i2c_client *i2c, · 36 unmodified lines
65 return arizona_dev_init(arizona);65 return arizona_dev_init(arizona);
66}66}
67 67
68static int __devexit arizona_i2c_remove(struct i2c_client *i2c)68static int arizona_i2c_remove(struct i2c_client *i2c)
69{69{
70 struct arizona *arizona = dev_get_drvdata(&i2c->dev);70 struct arizona *arizona = dev_get_drvdata(&i2c->dev);
71 arizona_dev_exit(arizona);71 arizona_dev_exit(arizona);
@@ -86,7 +86,7 @@ static struct i2c_driver arizona_i2c_driver = { · 14 unmodified lines
86 .pm = &arizona_pm_ops,86 .pm = &arizona_pm_ops,
87 },87 },
88 .probe = arizona_i2c_probe,88 .probe = arizona_i2c_probe,
89 .remove = __devexit_p(arizona_i2c_remove),89 .remove = arizona_i2c_remove,
90 .id_table = arizona_i2c_id,90 .id_table = arizona_i2c_id,
91};91};
92 92
drivers/mfd/arizona-spi.c+3−3
@@ -22,7 +22,7 @@ · 21 unmodified lines
22 22
23#include "arizona.h"23#include "arizona.h"
24 24
25static int __devinit arizona_spi_probe(struct spi_device *spi)25static int arizona_spi_probe(struct spi_device *spi)
26{26{
27 const struct spi_device_id *id = spi_get_device_id(spi);27 const struct spi_device_id *id = spi_get_device_id(spi);
28 struct arizona *arizona;28 struct arizona *arizona;
@@ -65,7 +65,7 @@ static int __devinit arizona_spi_probe(struct spi_device *spi) · 36 unmodified lines
65 return arizona_dev_init(arizona);65 return arizona_dev_init(arizona);
66}66}
67 67
68static int __devexit arizona_spi_remove(struct spi_device *spi)68static int arizona_spi_remove(struct spi_device *spi)
69{69{
70 struct arizona *arizona = dev_get_drvdata(&spi->dev);70 struct arizona *arizona = dev_get_drvdata(&spi->dev);
71 arizona_dev_exit(arizona);71 arizona_dev_exit(arizona);
@@ -86,7 +86,7 @@ static struct spi_driver arizona_spi_driver = { · 14 unmodified lines
86 .pm = &arizona_pm_ops,86 .pm = &arizona_pm_ops,
87 },87 },
88 .probe = arizona_spi_probe,88 .probe = arizona_spi_probe,
89 .remove = __devexit_p(arizona_spi_remove),89 .remove = arizona_spi_remove,
90 .id_table = arizona_spi_ids,90 .id_table = arizona_spi_ids,
91};91};
92 92
drivers/mfd/asic3.c+2−2
@@ -1039,7 +1039,7 @@ static int __init asic3_probe(struct platform_device *pdev) · 1038 unmodified lines
1039 return ret;1039 return ret;
1040}1040}
1041 1041
1042static int __devexit asic3_remove(struct platform_device *pdev)1042static int asic3_remove(struct platform_device *pdev)
1043{1043{
1044 int ret;1044 int ret;
1045 struct asic3 *asic = platform_get_drvdata(pdev);1045 struct asic3 *asic = platform_get_drvdata(pdev);
@@ -1071,7 +1071,7 @@ static struct platform_driver asic3_device_driver = { · 25 unmodified lines
1071 .driver = {1071 .driver = {
1072 .name = "asic3",1072 .name = "asic3",
1073 },1073 },
1074 .remove = __devexit_p(asic3_remove),1074 .remove = asic3_remove,
1075 .shutdown = asic3_shutdown,1075 .shutdown = asic3_shutdown,
1076};1076};
1077 1077
drivers/mfd/cs5535-mfd.c+6−6
@@ -71,9 +71,9 @@ static int cs5535_mfd_res_disable(struct platform_device *pdev) · 70 unmodified lines
71 return 0;71 return 0;
72}72}
73 73
74static __devinitdata struct resource cs5535_mfd_resources[NR_BARS];74static struct resource cs5535_mfd_resources[NR_BARS];
75 75
76static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {76static struct mfd_cell cs5535_mfd_cells[] = {
77 {77 {
78 .id = SMB_BAR,78 .id = SMB_BAR,
79 .name = "cs5535-smb",79 .name = "cs5535-smb",
@@ -113,7 +113,7 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = { · 33 unmodified lines
113};113};
114 114
115#ifdef CONFIG_OLPC115#ifdef CONFIG_OLPC
116static void __devinit cs5535_clone_olpc_cells(void)116static void cs5535_clone_olpc_cells(void)
117{117{
118 const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" };118 const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" };
119 119
@@ -126,7 +126,7 @@ static void __devinit cs5535_clone_olpc_cells(void) · 6 unmodified lines
126static void cs5535_clone_olpc_cells(void) { }126static void cs5535_clone_olpc_cells(void) { }
127#endif127#endif
128 128
129static int __devinit cs5535_mfd_probe(struct pci_dev *pdev,129static int cs5535_mfd_probe(struct pci_dev *pdev,
130 const struct pci_device_id *id)130 const struct pci_device_id *id)
131{131{
132 int err, i;132 int err, i;
@@ -166,7 +166,7 @@ err_disable: · 33 unmodified lines
166 return err;166 return err;
167}167}
168 168
169static void __devexit cs5535_mfd_remove(struct pci_dev *pdev)169static void cs5535_mfd_remove(struct pci_dev *pdev)
170{170{
171 mfd_remove_devices(&pdev->dev);171 mfd_remove_devices(&pdev->dev);
172 pci_disable_device(pdev);172 pci_disable_device(pdev);
@@ -183,7 +183,7 @@ static struct pci_driver cs5535_mfd_driver = { · 10 unmodified lines
183 .name = DRV_NAME,183 .name = DRV_NAME,
184 .id_table = cs5535_mfd_pci_tbl,184 .id_table = cs5535_mfd_pci_tbl,
185 .probe = cs5535_mfd_probe,185 .probe = cs5535_mfd_probe,
186 .remove = __devexit_p(cs5535_mfd_remove),186 .remove = cs5535_mfd_remove,
187};187};
188 188
189module_pci_driver(cs5535_mfd_driver);189module_pci_driver(cs5535_mfd_driver);
drivers/mfd/da903x.c+5−5
@@ -246,7 +246,7 @@ int da903x_query_status(struct device *dev, unsigned int sbits) · 245 unmodified lines
246}246}
247EXPORT_SYMBOL(da903x_query_status);247EXPORT_SYMBOL(da903x_query_status);
248 248
249static int __devinit da9030_init_chip(struct da903x_chip *chip)249static int da9030_init_chip(struct da903x_chip *chip)
250{250{
251 uint8_t chip_id;251 uint8_t chip_id;
252 int err;252 int err;
@@ -459,7 +459,7 @@ static int da903x_remove_subdevs(struct da903x_chip *chip) · 206 unmodified lines
459 return device_for_each_child(chip->dev, NULL, __remove_subdev);459 return device_for_each_child(chip->dev, NULL, __remove_subdev);
460}460}
461 461
462static int __devinit da903x_add_subdevs(struct da903x_chip *chip,462static int da903x_add_subdevs(struct da903x_chip *chip,
463 struct da903x_platform_data *pdata)463 struct da903x_platform_data *pdata)
464{464{
465 struct da903x_subdev_info *subdev;465 struct da903x_subdev_info *subdev;
@@ -491,7 +491,7 @@ failed: · 25 unmodified lines
491 return ret;491 return ret;
492}492}
493 493
494static int __devinit da903x_probe(struct i2c_client *client,494static int da903x_probe(struct i2c_client *client,
495 const struct i2c_device_id *id)495 const struct i2c_device_id *id)
496{496{
497 struct da903x_platform_data *pdata = client->dev.platform_data;497 struct da903x_platform_data *pdata = client->dev.platform_data;
@@ -544,7 +544,7 @@ out_free_chip: · 46 unmodified lines
544 return ret;544 return ret;
545}545}
546 546
547static int __devexit da903x_remove(struct i2c_client *client)547static int da903x_remove(struct i2c_client *client)
548{548{
549 struct da903x_chip *chip = i2c_get_clientdata(client);549 struct da903x_chip *chip = i2c_get_clientdata(client);
550 550
@@ -560,7 +560,7 @@ static struct i2c_driver da903x_driver = { · 9 unmodified lines
560 .owner = THIS_MODULE,560 .owner = THIS_MODULE,
561 },561 },
562 .probe = da903x_probe,562 .probe = da903x_probe,
563 .remove = __devexit_p(da903x_remove),563 .remove = da903x_remove,
564 .id_table = da903x_id_table,564 .id_table = da903x_id_table,
565};565};
566 566
drivers/mfd/da9052-core.c+2−2
@@ -515,7 +515,7 @@ static struct resource da9052_tsi_resources[] = { · 514 unmodified lines
515 },515 },
516};516};
517 517
518static struct mfd_cell __devinitdata da9052_subdev_info[] = {518static struct mfd_cell da9052_subdev_info[] = {
519 {519 {
520 .name = "da9052-regulator",520 .name = "da9052-regulator",
521 .id = 1,521 .id = 1,
@@ -769,7 +769,7 @@ struct regmap_config da9052_regmap_config = { · 247 unmodified lines
769};769};
770EXPORT_SYMBOL_GPL(da9052_regmap_config);770EXPORT_SYMBOL_GPL(da9052_regmap_config);
771 771
772int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)772int da9052_device_init(struct da9052 *da9052, u8 chip_id)
773{773{
774 struct da9052_pdata *pdata = da9052->dev->platform_data;774 struct da9052_pdata *pdata = da9052->dev->platform_data;
775 int ret;775 int ret;
drivers/mfd/da9052-i2c.c+3−3
@@ -64,7 +64,7 @@ static const struct of_device_id dialog_dt_ids[] = { · 63 unmodified lines
64};64};
65#endif65#endif
66 66
67static int __devinit da9052_i2c_probe(struct i2c_client *client,67static int da9052_i2c_probe(struct i2c_client *client,
68 const struct i2c_device_id *id)68 const struct i2c_device_id *id)
69{69{
70 struct da9052 *da9052;70 struct da9052 *da9052;
@@ -121,7 +121,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client, · 50 unmodified lines
121 return 0;121 return 0;
122}122}
123 123
124static int __devexit da9052_i2c_remove(struct i2c_client *client)124static int da9052_i2c_remove(struct i2c_client *client)
125{125{
126 struct da9052 *da9052 = i2c_get_clientdata(client);126 struct da9052 *da9052 = i2c_get_clientdata(client);
127 127
@@ -131,7 +131,7 @@ static int __devexit da9052_i2c_remove(struct i2c_client *client) · 3 unmodified lines
131 131
132static struct i2c_driver da9052_i2c_driver = {132static struct i2c_driver da9052_i2c_driver = {
133 .probe = da9052_i2c_probe,133 .probe = da9052_i2c_probe,
134 .remove = __devexit_p(da9052_i2c_remove),134 .remove = da9052_i2c_remove,
135 .id_table = da9052_i2c_id,135 .id_table = da9052_i2c_id,
136 .driver = {136 .driver = {
137 .name = "da9052",137 .name = "da9052",
drivers/mfd/da9052-spi.c+3−3
@@ -21,7 +21,7 @@ · 20 unmodified lines
21 21
22#include <linux/mfd/da9052/da9052.h>22#include <linux/mfd/da9052/da9052.h>
23 23
24static int __devinit da9052_spi_probe(struct spi_device *spi)24static int da9052_spi_probe(struct spi_device *spi)
25{25{
26 int ret;26 int ret;
27 const struct spi_device_id *id = spi_get_device_id(spi);27 const struct spi_device_id *id = spi_get_device_id(spi);
@@ -58,7 +58,7 @@ static int __devinit da9052_spi_probe(struct spi_device *spi) · 30 unmodified lines
58 return 0;58 return 0;
59}59}
60 60
61static int __devexit da9052_spi_remove(struct spi_device *spi)61static int da9052_spi_remove(struct spi_device *spi)
62{62{
63 struct da9052 *da9052 = dev_get_drvdata(&spi->dev);63 struct da9052 *da9052 = dev_get_drvdata(&spi->dev);
64 64
@@ -76,7 +76,7 @@ static struct spi_device_id da9052_spi_id[] = { · 11 unmodified lines
76 76
77static struct spi_driver da9052_spi_driver = {77static struct spi_driver da9052_spi_driver = {
78 .probe = da9052_spi_probe,78 .probe = da9052_spi_probe,
79 .remove = __devexit_p(da9052_spi_remove),79 .remove = da9052_spi_remove,
80 .id_table = da9052_spi_id,80 .id_table = da9052_spi_id,
81 .driver = {81 .driver = {
82 .name = "da9052",82 .name = "da9052",
drivers/mfd/da9055-core.c+2−2
@@ -377,7 +377,7 @@ static struct regmap_irq_chip da9055_regmap_irq_chip = { · 376 unmodified lines
377 .num_irqs = ARRAY_SIZE(da9055_irqs),377 .num_irqs = ARRAY_SIZE(da9055_irqs),
378};378};
379 379
380int __devinit da9055_device_init(struct da9055 *da9055)380int da9055_device_init(struct da9055 *da9055)
381{381{
382 struct da9055_pdata *pdata = da9055->dev->platform_data;382 struct da9055_pdata *pdata = da9055->dev->platform_data;
383 int ret;383 int ret;
@@ -412,7 +412,7 @@ err: · 28 unmodified lines
412 return ret;412 return ret;
413}413}
414 414
415void __devexit da9055_device_exit(struct da9055 *da9055)415void da9055_device_exit(struct da9055 *da9055)
416{416{
417 regmap_del_irq_chip(da9055->chip_irq, da9055->irq_data);417 regmap_del_irq_chip(da9055->chip_irq, da9055->irq_data);
418 mfd_remove_devices(da9055->dev);418 mfd_remove_devices(da9055->dev);
drivers/mfd/da9055-i2c.c+3−3
@@ -18,7 +18,7 @@ · 17 unmodified lines
18 18
19#include <linux/mfd/da9055/core.h>19#include <linux/mfd/da9055/core.h>
20 20
21static int __devinit da9055_i2c_probe(struct i2c_client *i2c,21static int da9055_i2c_probe(struct i2c_client *i2c,
22 const struct i2c_device_id *id)22 const struct i2c_device_id *id)
23{23{
24 struct da9055 *da9055;24 struct da9055 *da9055;
@@ -44,7 +44,7 @@ static int __devinit da9055_i2c_probe(struct i2c_client *i2c, · 19 unmodified lines
44 return da9055_device_init(da9055);44 return da9055_device_init(da9055);
45}45}
46 46
47static int __devexit da9055_i2c_remove(struct i2c_client *i2c)47static int da9055_i2c_remove(struct i2c_client *i2c)
48{48{
49 struct da9055 *da9055 = i2c_get_clientdata(i2c);49 struct da9055 *da9055 = i2c_get_clientdata(i2c);
50 50
@@ -60,7 +60,7 @@ static struct i2c_device_id da9055_i2c_id[] = { · 9 unmodified lines
60 60
61static struct i2c_driver da9055_i2c_driver = {61static struct i2c_driver da9055_i2c_driver = {
62 .probe = da9055_i2c_probe,62 .probe = da9055_i2c_probe,
63 .remove = __devexit_p(da9055_i2c_remove),63 .remove = da9055_i2c_remove,
64 .id_table = da9055_i2c_id,64 .id_table = da9055_i2c_id,
65 .driver = {65 .driver = {
66 .name = "da9055",66 .name = "da9055",
drivers/mfd/davinci_voicecodec.c+2−2
@@ -151,7 +151,7 @@ fail1: · 150 unmodified lines
151 return ret;151 return ret;
152}152}
153 153
154static int __devexit davinci_vc_remove(struct platform_device *pdev)154static int davinci_vc_remove(struct platform_device *pdev)
155{155{
156 struct davinci_vc *davinci_vc = platform_get_drvdata(pdev);156 struct davinci_vc *davinci_vc = platform_get_drvdata(pdev);
157 157
@@ -174,7 +174,7 @@ static struct platform_driver davinci_vc_driver = { · 16 unmodified lines
174 .name = "davinci_voicecodec",174 .name = "davinci_voicecodec",
175 .owner = THIS_MODULE,175 .owner = THIS_MODULE,
176 },176 },
177 .remove = __devexit_p(davinci_vc_remove),177 .remove = davinci_vc_remove,
178};178};
179 179
180static int __init davinci_vc_init(void)180static int __init davinci_vc_init(void)
drivers/mfd/db8500-prcmu.c+1−1
@@ -3088,7 +3088,7 @@ static void db8500_prcmu_update_cpufreq(void) · 3087 unmodified lines
3088 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic3088 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic
3089 *3089 *
3090 */3090 */
3091static int __devinit db8500_prcmu_probe(struct platform_device *pdev)3091static int db8500_prcmu_probe(struct platform_device *pdev)
3092{3092{
3093 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;3093 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;
3094 struct device_node *np = pdev->dev.of_node;3094 struct device_node *np = pdev->dev.of_node;
drivers/mfd/ezx-pcap.c+4−4
@@ -371,7 +371,7 @@ static int pcap_remove_subdev(struct device *dev, void *unused) · 370 unmodified lines
371 return 0;371 return 0;
372}372}
373 373
374static int __devinit pcap_add_subdev(struct pcap_chip *pcap,374static int pcap_add_subdev(struct pcap_chip *pcap,
375 struct pcap_subdev *subdev)375 struct pcap_subdev *subdev)
376{376{
377 struct platform_device *pdev;377 struct platform_device *pdev;
@@ -391,7 +391,7 @@ static int __devinit pcap_add_subdev(struct pcap_chip *pcap, · 13 unmodified lines
391 return ret;391 return ret;
392}392}
393 393
394static int __devexit ezx_pcap_remove(struct spi_device *spi)394static int ezx_pcap_remove(struct spi_device *spi)
395{395{
396 struct pcap_chip *pcap = dev_get_drvdata(&spi->dev);396 struct pcap_chip *pcap = dev_get_drvdata(&spi->dev);
397 struct pcap_platform_data *pdata = spi->dev.platform_data;397 struct pcap_platform_data *pdata = spi->dev.platform_data;
@@ -420,7 +420,7 @@ static int __devexit ezx_pcap_remove(struct spi_device *spi) · 22 unmodified lines
420 return 0;420 return 0;
421}421}
422 422
423static int __devinit ezx_pcap_probe(struct spi_device *spi)423static int ezx_pcap_probe(struct spi_device *spi)
424{424{
425 struct pcap_platform_data *pdata = spi->dev.platform_data;425 struct pcap_platform_data *pdata = spi->dev.platform_data;
426 struct pcap_chip *pcap;426 struct pcap_chip *pcap;
@@ -525,7 +525,7 @@ ret: · 98 unmodified lines
525 525
526static struct spi_driver ezxpcap_driver = {526static struct spi_driver ezxpcap_driver = {
527 .probe = ezx_pcap_probe,527 .probe = ezx_pcap_probe,
528 .remove = __devexit_p(ezx_pcap_remove),528 .remove = ezx_pcap_remove,
529 .driver = {529 .driver = {
530 .name = "ezx-pcap",530 .name = "ezx-pcap",
531 .owner = THIS_MODULE,531 .owner = THIS_MODULE,
drivers/mfd/htc-i2cpld.c+6−6
@@ -327,7 +327,7 @@ static void htcpld_chip_reset(struct i2c_client *client) · 326 unmodified lines
327 client, (chip_data->cache_out = chip_data->reset));327 client, (chip_data->cache_out = chip_data->reset));
328}328}
329 329
330static int __devinit htcpld_setup_chip_irq(330static int htcpld_setup_chip_irq(
331 struct platform_device *pdev,331 struct platform_device *pdev,
332 int chip_index)332 int chip_index)
333{333{
@@ -361,7 +361,7 @@ static int __devinit htcpld_setup_chip_irq( · 27 unmodified lines
361 return ret;361 return ret;
362}362}
363 363
364static int __devinit htcpld_register_chip_i2c(364static int htcpld_register_chip_i2c(
365 struct platform_device *pdev,365 struct platform_device *pdev,
366 int chip_index)366 int chip_index)
367{367{
@@ -419,7 +419,7 @@ static int __devinit htcpld_register_chip_i2c( · 51 unmodified lines
419 return 0;419 return 0;
420}420}
421 421
422static void __devinit htcpld_unregister_chip_i2c(422static void htcpld_unregister_chip_i2c(
423 struct platform_device *pdev,423 struct platform_device *pdev,
424 int chip_index)424 int chip_index)
425{425{
@@ -434,7 +434,7 @@ static void __devinit htcpld_unregister_chip_i2c( · 8 unmodified lines
434 i2c_unregister_device(chip->client);434 i2c_unregister_device(chip->client);
435}435}
436 436
437static int __devinit htcpld_register_chip_gpio(437static int htcpld_register_chip_gpio(
438 struct platform_device *pdev,438 struct platform_device *pdev,
439 int chip_index)439 int chip_index)
440{440{
@@ -501,7 +501,7 @@ static int __devinit htcpld_register_chip_gpio( · 60 unmodified lines
501 return 0;501 return 0;
502}502}
503 503
504static int __devinit htcpld_setup_chips(struct platform_device *pdev)504static int htcpld_setup_chips(struct platform_device *pdev)
505{505{
506 struct htcpld_data *htcpld;506 struct htcpld_data *htcpld;
507 struct device *dev = &pdev->dev;507 struct device *dev = &pdev->dev;
@@ -563,7 +563,7 @@ static int __devinit htcpld_setup_chips(struct platform_device *pdev) · 55 unmodified lines
563 return 0;563 return 0;
564}564}
565 565
566static int __devinit htcpld_core_probe(struct platform_device *pdev)566static int htcpld_core_probe(struct platform_device *pdev)
567{567{
568 struct htcpld_data *htcpld;568 struct htcpld_data *htcpld;
569 struct device *dev = &pdev->dev;569 struct device *dev = &pdev->dev;
drivers/mfd/intel_msic.c+5−5
@@ -306,7 +306,7 @@ int intel_msic_irq_read(struct intel_msic *msic, unsigned short reg, u8 *val) · 305 unmodified lines
306}306}
307EXPORT_SYMBOL_GPL(intel_msic_irq_read);307EXPORT_SYMBOL_GPL(intel_msic_irq_read);
308 308
309static int __devinit intel_msic_init_devices(struct intel_msic *msic)309static int intel_msic_init_devices(struct intel_msic *msic)
310{310{
311 struct platform_device *pdev = msic->pdev;311 struct platform_device *pdev = msic->pdev;
312 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;312 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
@@ -364,7 +364,7 @@ fail: · 51 unmodified lines
364 return ret;364 return ret;
365}365}
366 366
367static void __devexit intel_msic_remove_devices(struct intel_msic *msic)367static void intel_msic_remove_devices(struct intel_msic *msic)
368{368{
369 struct platform_device *pdev = msic->pdev;369 struct platform_device *pdev = msic->pdev;
370 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;370 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
@@ -375,7 +375,7 @@ static void __devexit intel_msic_remove_devices(struct intel_msic *msic) · 4 unmodified lines
375 gpio_free(pdata->ocd->gpio);375 gpio_free(pdata->ocd->gpio);
376}376}
377 377
378static int __devinit intel_msic_probe(struct platform_device *pdev)378static int intel_msic_probe(struct platform_device *pdev)
379{379{
380 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;380 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
381 struct intel_msic *msic;381 struct intel_msic *msic;
@@ -445,7 +445,7 @@ static int __devinit intel_msic_probe(struct platform_device *pdev) · 63 unmodified lines
445 return 0;445 return 0;
446}446}
447 447
448static int __devexit intel_msic_remove(struct platform_device *pdev)448static int intel_msic_remove(struct platform_device *pdev)
449{449{
450 struct intel_msic *msic = platform_get_drvdata(pdev);450 struct intel_msic *msic = platform_get_drvdata(pdev);
451 451
@@ -457,7 +457,7 @@ static int __devexit intel_msic_remove(struct platform_device *pdev) · 5 unmodified lines
457 457
458static struct platform_driver intel_msic_driver = {458static struct platform_driver intel_msic_driver = {
459 .probe = intel_msic_probe,459 .probe = intel_msic_probe,
460 .remove = __devexit_p(intel_msic_remove),460 .remove = intel_msic_remove,
461 .driver = {461 .driver = {
462 .name = "intel_msic",462 .name = "intel_msic",
463 .owner = THIS_MODULE,463 .owner = THIS_MODULE,
drivers/mfd/janz-cmodio.c+5−5
@@ -63,7 +63,7 @@ struct cmodio_device { · 62 unmodified lines
63 * Subdevices using the mfd-core API63 * Subdevices using the mfd-core API
64 */64 */
65 65
66static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,66static int cmodio_setup_subdevice(struct cmodio_device *priv,
67 char *name, unsigned int devno,67 char *name, unsigned int devno,
68 unsigned int modno)68 unsigned int modno)
69{69{
@@ -120,7 +120,7 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, · 50 unmodified lines
120}120}
121 121
122/* Probe each submodule using kernel parameters */122/* Probe each submodule using kernel parameters */
123static int __devinit cmodio_probe_submodules(struct cmodio_device *priv)123static int cmodio_probe_submodules(struct cmodio_device *priv)
124{124{
125 struct pci_dev *pdev = priv->pdev;125 struct pci_dev *pdev = priv->pdev;
126 unsigned int num_probed = 0;126 unsigned int num_probed = 0;
@@ -177,7 +177,7 @@ static const struct attribute_group cmodio_sysfs_attr_group = { · 50 unmodified lines
177 * PCI Driver177 * PCI Driver
178 */178 */
179 179
180static int __devinit cmodio_pci_probe(struct pci_dev *dev,180static int cmodio_pci_probe(struct pci_dev *dev,
181 const struct pci_device_id *id)181 const struct pci_device_id *id)
182{182{
183 struct cmodio_device *priv;183 struct cmodio_device *priv;
@@ -254,7 +254,7 @@ out_return: · 70 unmodified lines
254 return ret;254 return ret;
255}255}
256 256
257static void __devexit cmodio_pci_remove(struct pci_dev *dev)257static void cmodio_pci_remove(struct pci_dev *dev)
258{258{
259 struct cmodio_device *priv = pci_get_drvdata(dev);259 struct cmodio_device *priv = pci_get_drvdata(dev);
260 260
@@ -280,7 +280,7 @@ static struct pci_driver cmodio_pci_driver = { · 19 unmodified lines
280 .name = DRV_NAME,280 .name = DRV_NAME,
281 .id_table = cmodio_pci_ids,281 .id_table = cmodio_pci_ids,
282 .probe = cmodio_pci_probe,282 .probe = cmodio_pci_probe,
283 .remove = __devexit_p(cmodio_pci_remove),283 .remove = cmodio_pci_remove,
284};284};
285 285
286module_pci_driver(cmodio_pci_driver);286module_pci_driver(cmodio_pci_driver);
drivers/mfd/jz4740-adc.c+3−3
@@ -202,7 +202,7 @@ static struct mfd_cell jz4740_adc_cells[] = { · 201 unmodified lines
202 },202 },
203};203};
204 204
205static int __devinit jz4740_adc_probe(struct platform_device *pdev)205static int jz4740_adc_probe(struct platform_device *pdev)
206{206{
207 struct irq_chip_generic *gc;207 struct irq_chip_generic *gc;
208 struct irq_chip_type *ct;208 struct irq_chip_type *ct;
@@ -307,7 +307,7 @@ err_free: · 98 unmodified lines
307 return ret;307 return ret;
308}308}
309 309
310static int __devexit jz4740_adc_remove(struct platform_device *pdev)310static int jz4740_adc_remove(struct platform_device *pdev)
311{311{
312 struct jz4740_adc *adc = platform_get_drvdata(pdev);312 struct jz4740_adc *adc = platform_get_drvdata(pdev);
313 313
@@ -332,7 +332,7 @@ static int __devexit jz4740_adc_remove(struct platform_device *pdev) · 18 unmodified lines
332 332
333static struct platform_driver jz4740_adc_driver = {333static struct platform_driver jz4740_adc_driver = {
334 .probe = jz4740_adc_probe,334 .probe = jz4740_adc_probe,
335 .remove = __devexit_p(jz4740_adc_remove),335 .remove = jz4740_adc_remove,
336 .driver = {336 .driver = {
337 .name = "jz4740-adc",337 .name = "jz4740-adc",
338 .owner = THIS_MODULE,338 .owner = THIS_MODULE,
drivers/mfd/lm3533-core.c+9−9
@@ -382,7 +382,7 @@ static struct attribute_group lm3533_attribute_group = { · 381 unmodified lines
382 .attrs = lm3533_attributes382 .attrs = lm3533_attributes
383};383};
384 384
385static int __devinit lm3533_device_als_init(struct lm3533 *lm3533)385static int lm3533_device_als_init(struct lm3533 *lm3533)
386{386{
387 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;387 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
388 int ret;388 int ret;
@@ -405,7 +405,7 @@ static int __devinit lm3533_device_als_init(struct lm3533 *lm3533) · 16 unmodified lines
405 return 0;405 return 0;
406}406}
407 407
408static int __devinit lm3533_device_bl_init(struct lm3533 *lm3533)408static int lm3533_device_bl_init(struct lm3533 *lm3533)
409{409{
410 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;410 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
411 int i;411 int i;
@@ -434,7 +434,7 @@ static int __devinit lm3533_device_bl_init(struct lm3533 *lm3533) · 22 unmodified lines
434 return 0;434 return 0;
435}435}
436 436
437static int __devinit lm3533_device_led_init(struct lm3533 *lm3533)437static int lm3533_device_led_init(struct lm3533 *lm3533)
438{438{
439 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;439 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
440 int i;440 int i;
@@ -463,7 +463,7 @@ static int __devinit lm3533_device_led_init(struct lm3533 *lm3533) · 22 unmodified lines
463 return 0;463 return 0;
464}464}
465 465
466static int __devinit lm3533_device_setup(struct lm3533 *lm3533,466static int lm3533_device_setup(struct lm3533 *lm3533,
467 struct lm3533_platform_data *pdata)467 struct lm3533_platform_data *pdata)
468{468{
469 int ret;469 int ret;
@@ -479,7 +479,7 @@ static int __devinit lm3533_device_setup(struct lm3533 *lm3533, · 9 unmodified lines
479 return 0;479 return 0;
480}480}
481 481
482static int __devinit lm3533_device_init(struct lm3533 *lm3533)482static int lm3533_device_init(struct lm3533 *lm3533)
483{483{
484 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;484 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
485 int ret;485 int ret;
@@ -534,7 +534,7 @@ err_disable: · 48 unmodified lines
534 return ret;534 return ret;
535}535}
536 536
537static void __devexit lm3533_device_exit(struct lm3533 *lm3533)537static void lm3533_device_exit(struct lm3533 *lm3533)
538{538{
539 dev_dbg(lm3533->dev, "%s\n", __func__);539 dev_dbg(lm3533->dev, "%s\n", __func__);
540 540
@@ -596,7 +596,7 @@ static struct regmap_config regmap_config = { · 55 unmodified lines
596 .precious_reg = lm3533_precious_register,596 .precious_reg = lm3533_precious_register,
597};597};
598 598
599static int __devinit lm3533_i2c_probe(struct i2c_client *i2c,599static int lm3533_i2c_probe(struct i2c_client *i2c,
600 const struct i2c_device_id *id)600 const struct i2c_device_id *id)
601{601{
602 struct lm3533 *lm3533;602 struct lm3533 *lm3533;
@@ -624,7 +624,7 @@ static int __devinit lm3533_i2c_probe(struct i2c_client *i2c, · 21 unmodified lines
624 return 0;624 return 0;
625}625}
626 626
627static int __devexit lm3533_i2c_remove(struct i2c_client *i2c)627static int lm3533_i2c_remove(struct i2c_client *i2c)
628{628{
629 struct lm3533 *lm3533 = i2c_get_clientdata(i2c);629 struct lm3533 *lm3533 = i2c_get_clientdata(i2c);
630 630
@@ -648,7 +648,7 @@ static struct i2c_driver lm3533_i2c_driver = { · 17 unmodified lines
648 },648 },
649 .id_table = lm3533_i2c_ids,649 .id_table = lm3533_i2c_ids,
650 .probe = lm3533_i2c_probe,650 .probe = lm3533_i2c_probe,
651 .remove = __devexit_p(lm3533_i2c_remove),651 .remove = lm3533_i2c_remove,
652};652};
653 653
654static int __init lm3533_i2c_init(void)654static int __init lm3533_i2c_init(void)
drivers/mfd/lp8788.c+2−2
@@ -203,7 +203,7 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id) · 202 unmodified lines
203 ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);203 ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
204}204}
205 205
206static int __devexit lp8788_remove(struct i2c_client *cl)206static int lp8788_remove(struct i2c_client *cl)
207{207{
208 struct lp8788 *lp = i2c_get_clientdata(cl);208 struct lp8788 *lp = i2c_get_clientdata(cl);
209 209
@@ -224,7 +224,7 @@ static struct i2c_driver lp8788_driver = { · 14 unmodified lines
224 .owner = THIS_MODULE,224 .owner = THIS_MODULE,
225 },225 },
226 .probe = lp8788_probe,226 .probe = lp8788_probe,
227 .remove = __devexit_p(lp8788_remove),227 .remove = lp8788_remove,
228 .id_table = lp8788_ids,228 .id_table = lp8788_ids,
229};229};
230 230
drivers/mfd/lpc_ich.c+10−10
@@ -196,7 +196,7 @@ enum lpc_chipsets { · 195 unmodified lines
196 LPC_LPT_LP, /* Lynx Point-LP */196 LPC_LPT_LP, /* Lynx Point-LP */
197};197};
198 198
199struct lpc_ich_info lpc_chipset_info[] __devinitdata = {199struct lpc_ich_info lpc_chipset_info[] = {
200 [LPC_ICH] = {200 [LPC_ICH] = {
201 .name = "ICH",201 .name = "ICH",
202 .iTCO_version = 1,202 .iTCO_version = 1,
@@ -672,7 +672,7 @@ static void lpc_ich_restore_config_space(struct pci_dev *dev) · 469 unmodified lines
672 }672 }
673}673}
674 674
675static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev)675static void lpc_ich_enable_acpi_space(struct pci_dev *dev)
676{676{
677 u8 reg_save;677 u8 reg_save;
678 678
@@ -681,7 +681,7 @@ static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev) · 2 unmodified lines
681 lpc_ich_acpi_save = reg_save;681 lpc_ich_acpi_save = reg_save;
682}682}
683 683
684static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev)684static void lpc_ich_enable_gpio_space(struct pci_dev *dev)
685{685{
686 u8 reg_save;686 u8 reg_save;
687 687
@@ -690,7 +690,7 @@ static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev) · 2 unmodified lines
690 lpc_ich_gpio_save = reg_save;690 lpc_ich_gpio_save = reg_save;
691}691}
692 692
693static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell,693static void lpc_ich_finalize_cell(struct mfd_cell *cell,
694 const struct pci_device_id *id)694 const struct pci_device_id *id)
695{695{
696 cell->platform_data = &lpc_chipset_info[id->driver_data];696 cell->platform_data = &lpc_chipset_info[id->driver_data];
@@ -702,7 +702,7 @@ static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell, · 5 unmodified lines
702 * GPIO groups and it's enough to have access to one of these to instantiate702 * GPIO groups and it's enough to have access to one of these to instantiate
703 * the device.703 * the device.
704 */704 */
705static int __devinit lpc_ich_check_conflict_gpio(struct resource *res)705static int lpc_ich_check_conflict_gpio(struct resource *res)
706{706{
707 int ret;707 int ret;
708 u8 use_gpio = 0;708 u8 use_gpio = 0;
@@ -721,7 +721,7 @@ static int __devinit lpc_ich_check_conflict_gpio(struct resource *res) · 12 unmodified lines
721 return use_gpio ? use_gpio : ret;721 return use_gpio ? use_gpio : ret;
722}722}
723 723
724static int __devinit lpc_ich_init_gpio(struct pci_dev *dev,724static int lpc_ich_init_gpio(struct pci_dev *dev,
725 const struct pci_device_id *id)725 const struct pci_device_id *id)
726{726{
727 u32 base_addr_cfg;727 u32 base_addr_cfg;
@@ -798,7 +798,7 @@ gpio_done: · 70 unmodified lines
798 return ret;798 return ret;
799}799}
800 800
801static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,801static int lpc_ich_init_wdt(struct pci_dev *dev,
802 const struct pci_device_id *id)802 const struct pci_device_id *id)
803{803{
804 u32 base_addr_cfg;804 u32 base_addr_cfg;
@@ -852,7 +852,7 @@ wdt_done: · 47 unmodified lines
852 return ret;852 return ret;
853}853}
854 854
855static int __devinit lpc_ich_probe(struct pci_dev *dev,855static int lpc_ich_probe(struct pci_dev *dev,
856 const struct pci_device_id *id)856 const struct pci_device_id *id)
857{857{
858 int ret;858 int ret;
@@ -878,7 +878,7 @@ static int __devinit lpc_ich_probe(struct pci_dev *dev, · 19 unmodified lines
878 return 0;878 return 0;
879}879}
880 880
881static void __devexit lpc_ich_remove(struct pci_dev *dev)881static void lpc_ich_remove(struct pci_dev *dev)
882{882{
883 mfd_remove_devices(&dev->dev);883 mfd_remove_devices(&dev->dev);
884 lpc_ich_restore_config_space(dev);884 lpc_ich_restore_config_space(dev);
@@ -888,7 +888,7 @@ static struct pci_driver lpc_ich_driver = { · 3 unmodified lines
888 .name = "lpc_ich",888 .name = "lpc_ich",
889 .id_table = lpc_ich_ids,889 .id_table = lpc_ich_ids,
890 .probe = lpc_ich_probe,890 .probe = lpc_ich_probe,
891 .remove = __devexit_p(lpc_ich_remove),891 .remove = lpc_ich_remove,
892};892};
893 893
894static int __init lpc_ich_init(void)894static int __init lpc_ich_init(void)
drivers/mfd/lpc_sch.c+3−3
@@ -83,7 +83,7 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { · 82 unmodified lines
83};83};
84MODULE_DEVICE_TABLE(pci, lpc_sch_ids);84MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
85 85
86static int __devinit lpc_sch_probe(struct pci_dev *dev,86static int lpc_sch_probe(struct pci_dev *dev,
87 const struct pci_device_id *id)87 const struct pci_device_id *id)
88{88{
89 unsigned int base_addr_cfg;89 unsigned int base_addr_cfg;
@@ -164,7 +164,7 @@ out_dev: · 74 unmodified lines
164 return ret;164 return ret;
165}165}
166 166
167static void __devexit lpc_sch_remove(struct pci_dev *dev)167static void lpc_sch_remove(struct pci_dev *dev)
168{168{
169 mfd_remove_devices(&dev->dev);169 mfd_remove_devices(&dev->dev);
170}170}
@@ -173,7 +173,7 @@ static struct pci_driver lpc_sch_driver = { · 2 unmodified lines
173 .name = "lpc_sch",173 .name = "lpc_sch",
174 .id_table = lpc_sch_ids,174 .id_table = lpc_sch_ids,
175 .probe = lpc_sch_probe,175 .probe = lpc_sch_probe,
176 .remove = __devexit_p(lpc_sch_remove),176 .remove = lpc_sch_remove,
177};177};
178 178
179module_pci_driver(lpc_sch_driver);179module_pci_driver(lpc_sch_driver);
drivers/mfd/max77686.c+1−1
@@ -45,7 +45,7 @@ static struct regmap_config max77686_regmap_config = { · 44 unmodified lines
45};45};
46 46
47#ifdef CONFIG_OF47#ifdef CONFIG_OF
48static struct of_device_id __devinitdata max77686_pmic_dt_match[] = {48static struct of_device_id max77686_pmic_dt_match[] = {
49 {.compatible = "maxim,max77686", .data = 0},49 {.compatible = "maxim,max77686", .data = 0},
50 {},50 {},
51};51};
drivers/mfd/max8907.c+2−2
@@ -183,7 +183,7 @@ static void max8907_power_off(void) · 182 unmodified lines
183 MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF);183 MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF);
184}184}
185 185
186static __devinit int max8907_i2c_probe(struct i2c_client *i2c,186static int max8907_i2c_probe(struct i2c_client *i2c,
187 const struct i2c_device_id *id)187 const struct i2c_device_id *id)
188{188{
189 struct max8907 *max8907;189 struct max8907 *max8907;
@@ -288,7 +288,7 @@ err_alloc_drvdata: · 98 unmodified lines
288 return ret;288 return ret;
289}289}
290 290
291static __devexit int max8907_i2c_remove(struct i2c_client *i2c)291static int max8907_i2c_remove(struct i2c_client *i2c)
292{292{
293 struct max8907 *max8907 = i2c_get_clientdata(i2c);293 struct max8907 *max8907 = i2c_get_clientdata(i2c);
294 294
drivers/mfd/max8925-core.c+29−29
@@ -19,12 +19,12 @@ · 18 unmodified lines
19#include <linux/mfd/core.h>19#include <linux/mfd/core.h>
20#include <linux/mfd/max8925.h>20#include <linux/mfd/max8925.h>
21 21
22static struct resource bk_resources[] __devinitdata = {22static struct resource bk_resources[] = {
23 { 0x84, 0x84, "mode control", IORESOURCE_REG, },23 { 0x84, 0x84, "mode control", IORESOURCE_REG, },
24 { 0x85, 0x85, "control", IORESOURCE_REG, },24 { 0x85, 0x85, "control", IORESOURCE_REG, },
25};25};
26 26
27static struct mfd_cell bk_devs[] __devinitdata = {27static struct mfd_cell bk_devs[] = {
28 {28 {
29 .name = "max8925-backlight",29 .name = "max8925-backlight",
30 .num_resources = ARRAY_SIZE(bk_resources),30 .num_resources = ARRAY_SIZE(bk_resources),
@@ -110,99 +110,99 @@ static struct mfd_cell onkey_devs[] = { · 79 unmodified lines
110 },110 },
111};111};
112 112
113static struct resource sd1_resources[] __devinitdata = {113static struct resource sd1_resources[] = {
114 {0x06, 0x06, "sdv", IORESOURCE_REG, },114 {0x06, 0x06, "sdv", IORESOURCE_REG, },
115};115};
116 116
117static struct resource sd2_resources[] __devinitdata = {117static struct resource sd2_resources[] = {
118 {0x09, 0x09, "sdv", IORESOURCE_REG, },118 {0x09, 0x09, "sdv", IORESOURCE_REG, },
119};119};
120 120
121static struct resource sd3_resources[] __devinitdata = {121static struct resource sd3_resources[] = {
122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, },122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, },
123};123};
124 124
125static struct resource ldo1_resources[] __devinitdata = {125static struct resource ldo1_resources[] = {
126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, },126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, },
127};127};
128 128
129static struct resource ldo2_resources[] __devinitdata = {129static struct resource ldo2_resources[] = {
130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, },130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, },
131};131};
132 132
133static struct resource ldo3_resources[] __devinitdata = {133static struct resource ldo3_resources[] = {
134 {0x22, 0x22, "ldov", IORESOURCE_REG, },134 {0x22, 0x22, "ldov", IORESOURCE_REG, },
135};135};
136 136
137static struct resource ldo4_resources[] __devinitdata = {137static struct resource ldo4_resources[] = {
138 {0x26, 0x26, "ldov", IORESOURCE_REG, },138 {0x26, 0x26, "ldov", IORESOURCE_REG, },
139};139};
140 140
141static struct resource ldo5_resources[] __devinitdata = {141static struct resource ldo5_resources[] = {
142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, },142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, },
143};143};
144 144
145static struct resource ldo6_resources[] __devinitdata = {145static struct resource ldo6_resources[] = {
146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, },146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, },
147};147};
148 148
149static struct resource ldo7_resources[] __devinitdata = {149static struct resource ldo7_resources[] = {
150 {0x32, 0x32, "ldov", IORESOURCE_REG, },150 {0x32, 0x32, "ldov", IORESOURCE_REG, },
151};151};
152 152
153static struct resource ldo8_resources[] __devinitdata = {153static struct resource ldo8_resources[] = {
154 {0x36, 0x36, "ldov", IORESOURCE_REG, },154 {0x36, 0x36, "ldov", IORESOURCE_REG, },
155};155};
156 156
157static struct resource ldo9_resources[] __devinitdata = {157static struct resource ldo9_resources[] = {
158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, },158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, },
159};159};
160 160
161static struct resource ldo10_resources[] __devinitdata = {161static struct resource ldo10_resources[] = {
162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, },162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, },
163};163};
164 164
165static struct resource ldo11_resources[] __devinitdata = {165static struct resource ldo11_resources[] = {
166 {0x42, 0x42, "ldov", IORESOURCE_REG, },166 {0x42, 0x42, "ldov", IORESOURCE_REG, },
167};167};
168 168
169static struct resource ldo12_resources[] __devinitdata = {169static struct resource ldo12_resources[] = {
170 {0x46, 0x46, "ldov", IORESOURCE_REG, },170 {0x46, 0x46, "ldov", IORESOURCE_REG, },
171};171};
172 172
173static struct resource ldo13_resources[] __devinitdata = {173static struct resource ldo13_resources[] = {
174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, },174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, },
175};175};
176 176
177static struct resource ldo14_resources[] __devinitdata = {177static struct resource ldo14_resources[] = {
178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, },178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, },
179};179};
180 180
181static struct resource ldo15_resources[] __devinitdata = {181static struct resource ldo15_resources[] = {
182 {0x52, 0x52, "ldov", IORESOURCE_REG, },182 {0x52, 0x52, "ldov", IORESOURCE_REG, },
183};183};
184 184
185static struct resource ldo16_resources[] __devinitdata = {185static struct resource ldo16_resources[] = {
186 {0x12, 0x12, "ldov", IORESOURCE_REG, },186 {0x12, 0x12, "ldov", IORESOURCE_REG, },
187};187};
188 188
189static struct resource ldo17_resources[] __devinitdata = {189static struct resource ldo17_resources[] = {
190 {0x16, 0x16, "ldov", IORESOURCE_REG, },190 {0x16, 0x16, "ldov", IORESOURCE_REG, },
191};191};
192 192
193static struct resource ldo18_resources[] __devinitdata = {193static struct resource ldo18_resources[] = {
194 {0x74, 0x74, "ldov", IORESOURCE_REG, },194 {0x74, 0x74, "ldov", IORESOURCE_REG, },
195};195};
196 196
197static struct resource ldo19_resources[] __devinitdata = {197static struct resource ldo19_resources[] = {
198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, },198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, },
199};199};
200 200
201static struct resource ldo20_resources[] __devinitdata = {201static struct resource ldo20_resources[] = {
202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, },202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, },
203};203};
204 204
205static struct mfd_cell reg_devs[] __devinitdata = {205static struct mfd_cell reg_devs[] = {
206 {206 {
207 .name = "max8925-regulator",207 .name = "max8925-regulator",
208 .id = 0,208 .id = 0,
@@ -714,7 +714,7 @@ tsc_irq: · 505 unmodified lines
714 return 0;714 return 0;
715}715}
716 716
717static void __devinit init_regulator(struct max8925_chip *chip,717static void init_regulator(struct max8925_chip *chip,
718 struct max8925_platform_data *pdata)718 struct max8925_platform_data *pdata)
719{719{
720 int ret;720 int ret;
@@ -821,7 +821,7 @@ static void __devinit init_regulator(struct max8925_chip *chip, · 100 unmodified lines
821 }821 }
822}822}
823 823
824int __devinit max8925_device_init(struct max8925_chip *chip,824int max8925_device_init(struct max8925_chip *chip,
825 struct max8925_platform_data *pdata)825 struct max8925_platform_data *pdata)
826{826{
827 int ret;827 int ret;
@@ -901,7 +901,7 @@ out: · 73 unmodified lines
901 return ret;901 return ret;
902}902}
903 903
904void __devexit max8925_device_exit(struct max8925_chip *chip)904void max8925_device_exit(struct max8925_chip *chip)
905{905{
906 if (chip->core_irq)906 if (chip->core_irq)
907 free_irq(chip->core_irq, chip);907 free_irq(chip->core_irq, chip);
drivers/mfd/max8925-i2c.c+3−3
@@ -135,7 +135,7 @@ static const struct i2c_device_id max8925_id_table[] = { · 134 unmodified lines
135};135};
136MODULE_DEVICE_TABLE(i2c, max8925_id_table);136MODULE_DEVICE_TABLE(i2c, max8925_id_table);
137 137
138static int __devinit max8925_probe(struct i2c_client *client,138static int max8925_probe(struct i2c_client *client,
139 const struct i2c_device_id *id)139 const struct i2c_device_id *id)
140{140{
141 struct max8925_platform_data *pdata = client->dev.platform_data;141 struct max8925_platform_data *pdata = client->dev.platform_data;
@@ -168,7 +168,7 @@ static int __devinit max8925_probe(struct i2c_client *client, · 26 unmodified lines
168 return 0;168 return 0;
169}169}
170 170
171static int __devexit max8925_remove(struct i2c_client *client)171static int max8925_remove(struct i2c_client *client)
172{172{
173 struct max8925_chip *chip = i2c_get_clientdata(client);173 struct max8925_chip *chip = i2c_get_clientdata(client);
174 174
@@ -210,7 +210,7 @@ static struct i2c_driver max8925_driver = { · 35 unmodified lines
210 .pm = &max8925_pm_ops,210 .pm = &max8925_pm_ops,
211 },211 },
212 .probe = max8925_probe,212 .probe = max8925_probe,
213 .remove = __devexit_p(max8925_remove),213 .remove = max8925_remove,
214 .id_table = max8925_id_table,214 .id_table = max8925_id_table,
215};215};
216 216
drivers/mfd/mc13xxx-i2c.c+2−2
@@ -85,7 +85,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client, · 84 unmodified lines
85 return ret;85 return ret;
86}86}
87 87
88static int __devexit mc13xxx_i2c_remove(struct i2c_client *client)88static int mc13xxx_i2c_remove(struct i2c_client *client)
89{89{
90 struct mc13xxx *mc13xxx = dev_get_drvdata(&client->dev);90 struct mc13xxx *mc13xxx = dev_get_drvdata(&client->dev);
91 91
@@ -102,7 +102,7 @@ static struct i2c_driver mc13xxx_i2c_driver = { · 10 unmodified lines
102 .of_match_table = mc13xxx_dt_ids,102 .of_match_table = mc13xxx_dt_ids,
103 },103 },
104 .probe = mc13xxx_i2c_probe,104 .probe = mc13xxx_i2c_probe,
105 .remove = __devexit_p(mc13xxx_i2c_remove),105 .remove = mc13xxx_i2c_remove,
106};106};
107 107
108static int __init mc13xxx_i2c_init(void)108static int __init mc13xxx_i2c_init(void)
drivers/mfd/mc13xxx-spi.c+2−2
@@ -159,7 +159,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi) · 158 unmodified lines
159 return ret;159 return ret;
160}160}
161 161
162static int __devexit mc13xxx_spi_remove(struct spi_device *spi)162static int mc13xxx_spi_remove(struct spi_device *spi)
163{163{
164 struct mc13xxx *mc13xxx = dev_get_drvdata(&spi->dev);164 struct mc13xxx *mc13xxx = dev_get_drvdata(&spi->dev);
165 165
@@ -176,7 +176,7 @@ static struct spi_driver mc13xxx_spi_driver = { · 10 unmodified lines
176 .of_match_table = mc13xxx_dt_ids,176 .of_match_table = mc13xxx_dt_ids,
177 },177 },
178 .probe = mc13xxx_spi_probe,178 .probe = mc13xxx_spi_probe,
179 .remove = __devexit_p(mc13xxx_spi_remove),179 .remove = mc13xxx_spi_remove,
180};180};
181 181
182static int __init mc13xxx_init(void)182static int __init mc13xxx_init(void)
drivers/mfd/omap-usb-host.c+2−2
@@ -464,7 +464,7 @@ static void omap_usbhs_deinit(struct device *dev) · 463 unmodified lines
464 *464 *
465 * Allocates basic resources for this USB host controller.465 * Allocates basic resources for this USB host controller.
466 */466 */
467static int __devinit usbhs_omap_probe(struct platform_device *pdev)467static int usbhs_omap_probe(struct platform_device *pdev)
468{468{
469 struct device *dev = &pdev->dev;469 struct device *dev = &pdev->dev;
470 struct usbhs_omap_platform_data *pdata = dev->platform_data;470 struct usbhs_omap_platform_data *pdata = dev->platform_data;
@@ -652,7 +652,7 @@ end_probe: · 181 unmodified lines
652 *652 *
653 * Reverses the effect of usbhs_omap_probe().653 * Reverses the effect of usbhs_omap_probe().
654 */654 */
655static int __devexit usbhs_omap_remove(struct platform_device *pdev)655static int usbhs_omap_remove(struct platform_device *pdev)
656{656{
657 struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);657 struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
658 658
drivers/mfd/omap-usb-tll.c+3−3
@@ -200,7 +200,7 @@ static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode) · 199 unmodified lines
200 *200 *
201 * Allocates basic resources for this USB host controller.201 * Allocates basic resources for this USB host controller.
202 */202 */
203static int __devinit usbtll_omap_probe(struct platform_device *pdev)203static int usbtll_omap_probe(struct platform_device *pdev)
204{204{
205 struct device *dev = &pdev->dev;205 struct device *dev = &pdev->dev;
206 struct usbtll_omap_platform_data *pdata = dev->platform_data;206 struct usbtll_omap_platform_data *pdata = dev->platform_data;
@@ -348,7 +348,7 @@ end: · 141 unmodified lines
348 *348 *
349 * Reverses the effect of usbtll_omap_probe().349 * Reverses the effect of usbtll_omap_probe().
350 */350 */
351static int __devexit usbtll_omap_remove(struct platform_device *pdev)351static int usbtll_omap_remove(struct platform_device *pdev)
352{352{
353 struct usbtll_omap *tll = platform_get_drvdata(pdev);353 struct usbtll_omap *tll = platform_get_drvdata(pdev);
354 354
@@ -424,7 +424,7 @@ static struct platform_driver usbtll_omap_driver = { · 69 unmodified lines
424 .pm = &usbtllomap_dev_pm_ops,424 .pm = &usbtllomap_dev_pm_ops,
425 },425 },
426 .probe = usbtll_omap_probe,426 .probe = usbtll_omap_probe,
427 .remove = __devexit_p(usbtll_omap_remove),427 .remove = usbtll_omap_remove,
428};428};
429 429
430int omap_tll_enable(void)430int omap_tll_enable(void)
drivers/mfd/palmas.c+3−3
@@ -247,7 +247,7 @@ static struct regmap_irq_chip palmas_irq_chip = { · 246 unmodified lines
247 PALMAS_INT1_MASK),247 PALMAS_INT1_MASK),
248};248};
249 249
250static void __devinit palmas_dt_to_pdata(struct device_node *node,250static void palmas_dt_to_pdata(struct device_node *node,
251 struct palmas_platform_data *pdata)251 struct palmas_platform_data *pdata)
252{252{
253 int ret;253 int ret;
@@ -275,7 +275,7 @@ static void __devinit palmas_dt_to_pdata(struct device_node *node, · 21 unmodified lines
275 PALMAS_POWER_CTRL_ENABLE2_MASK;275 PALMAS_POWER_CTRL_ENABLE2_MASK;
276}276}
277 277
278static int __devinit palmas_i2c_probe(struct i2c_client *i2c,278static int palmas_i2c_probe(struct i2c_client *i2c,
279 const struct i2c_device_id *id)279 const struct i2c_device_id *id)
280{280{
281 struct palmas *palmas;281 struct palmas *palmas;
@@ -492,7 +492,7 @@ static const struct i2c_device_id palmas_i2c_id[] = { · 210 unmodified lines
492};492};
493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
494 494
495static struct of_device_id __devinitdata of_palmas_match_tbl[] = {495static struct of_device_id of_palmas_match_tbl[] = {
496 { .compatible = "ti,palmas", },496 { .compatible = "ti,palmas", },
497 { /* end */ }497 { /* end */ }
498};498};
drivers/mfd/pcf50633-adc.c+3−3
@@ -199,7 +199,7 @@ static void pcf50633_adc_irq(int irq, void *data) · 198 unmodified lines
199 kfree(req);199 kfree(req);
200}200}
201 201
202static int __devinit pcf50633_adc_probe(struct platform_device *pdev)202static int pcf50633_adc_probe(struct platform_device *pdev)
203{203{
204 struct pcf50633_adc *adc;204 struct pcf50633_adc *adc;
205 205
@@ -218,7 +218,7 @@ static int __devinit pcf50633_adc_probe(struct platform_device *pdev) · 12 unmodified lines
218 return 0;218 return 0;
219}219}
220 220
221static int __devexit pcf50633_adc_remove(struct platform_device *pdev)221static int pcf50633_adc_remove(struct platform_device *pdev)
222{222{
223 struct pcf50633_adc *adc = platform_get_drvdata(pdev);223 struct pcf50633_adc *adc = platform_get_drvdata(pdev);
224 int i, head;224 int i, head;
@@ -246,7 +246,7 @@ static struct platform_driver pcf50633_adc_driver = { · 21 unmodified lines
246 .name = "pcf50633-adc",246 .name = "pcf50633-adc",
247 },247 },
248 .probe = pcf50633_adc_probe,248 .probe = pcf50633_adc_probe,
249 .remove = __devexit_p(pcf50633_adc_remove),249 .remove = pcf50633_adc_remove,
250};250};
251 251
252module_platform_driver(pcf50633_adc_driver);252module_platform_driver(pcf50633_adc_driver);
drivers/mfd/pcf50633-core.c+3−3
@@ -191,7 +191,7 @@ static struct regmap_config pcf50633_regmap_config = { · 190 unmodified lines
191 .val_bits = 8,191 .val_bits = 8,
192};192};
193 193
194static int __devinit pcf50633_probe(struct i2c_client *client,194static int pcf50633_probe(struct i2c_client *client,
195 const struct i2c_device_id *ids)195 const struct i2c_device_id *ids)
196{196{
197 struct pcf50633 *pcf;197 struct pcf50633 *pcf;
@@ -275,7 +275,7 @@ static int __devinit pcf50633_probe(struct i2c_client *client, · 77 unmodified lines
275 return 0;275 return 0;
276}276}
277 277
278static int __devexit pcf50633_remove(struct i2c_client *client)278static int pcf50633_remove(struct i2c_client *client)
279{279{
280 struct pcf50633 *pcf = i2c_get_clientdata(client);280 struct pcf50633 *pcf = i2c_get_clientdata(client);
281 int i;281 int i;
@@ -308,7 +308,7 @@ static struct i2c_driver pcf50633_driver = { · 26 unmodified lines
308 },308 },
309 .id_table = pcf50633_id_table,309 .id_table = pcf50633_id_table,
310 .probe = pcf50633_probe,310 .probe = pcf50633_probe,
311 .remove = __devexit_p(pcf50633_remove),311 .remove = pcf50633_remove,
312};312};
313 313
314static int __init pcf50633_init(void)314static int __init pcf50633_init(void)
drivers/mfd/pm8921-core.c+4−4
@@ -80,7 +80,7 @@ static struct pm8xxx_drvdata pm8921_drvdata = { · 79 unmodified lines
80 .pmic_read_irq_stat = pm8921_read_irq_stat,80 .pmic_read_irq_stat = pm8921_read_irq_stat,
81};81};
82 82
83static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data83static int pm8921_add_subdevices(const struct pm8921_platform_data
84 *pdata,84 *pdata,
85 struct pm8921 *pmic,85 struct pm8921 *pmic,
86 u32 rev)86 u32 rev)
@@ -104,7 +104,7 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data · 17 unmodified lines
104 return ret;104 return ret;
105}105}
106 106
107static int __devinit pm8921_probe(struct platform_device *pdev)107static int pm8921_probe(struct platform_device *pdev)
108{108{
109 const struct pm8921_platform_data *pdata = pdev->dev.platform_data;109 const struct pm8921_platform_data *pdata = pdev->dev.platform_data;
110 struct pm8921 *pmic;110 struct pm8921 *pmic;
@@ -165,7 +165,7 @@ err_read_rev: · 54 unmodified lines
165 return rc;165 return rc;
166}166}
167 167
168static int __devexit pm8921_remove(struct platform_device *pdev)168static int pm8921_remove(struct platform_device *pdev)
169{169{
170 struct pm8xxx_drvdata *drvdata;170 struct pm8xxx_drvdata *drvdata;
171 struct pm8921 *pmic = NULL;171 struct pm8921 *pmic = NULL;
@@ -187,7 +187,7 @@ static int __devexit pm8921_remove(struct platform_device *pdev) · 15 unmodified lines
187 187
188static struct platform_driver pm8921_driver = {188static struct platform_driver pm8921_driver = {
189 .probe = pm8921_probe,189 .probe = pm8921_probe,
190 .remove = __devexit_p(pm8921_remove),190 .remove = pm8921_remove,
191 .driver = {191 .driver = {
192 .name = "pm8921-core",192 .name = "pm8921-core",
193 .owner = THIS_MODULE,193 .owner = THIS_MODULE,
drivers/mfd/pm8xxx-irq.c+2−2
@@ -309,7 +309,7 @@ bail_out: · 308 unmodified lines
309}309}
310EXPORT_SYMBOL_GPL(pm8xxx_get_irq_stat);310EXPORT_SYMBOL_GPL(pm8xxx_get_irq_stat);
311 311
312struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev,312struct pm_irq_chip * pm8xxx_irq_init(struct device *dev,
313 const struct pm8xxx_irq_platform_data *pdata)313 const struct pm8xxx_irq_platform_data *pdata)
314{314{
315 struct pm_irq_chip *chip;315 struct pm_irq_chip *chip;
@@ -363,7 +363,7 @@ struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev, · 47 unmodified lines
363 return chip;363 return chip;
364}364}
365 365
366int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip)366int pm8xxx_irq_exit(struct pm_irq_chip *chip)
367{367{
368 irq_set_chained_handler(chip->devirq, NULL);368 irq_set_chained_handler(chip->devirq, NULL);
369 kfree(chip);369 kfree(chip);
drivers/mfd/rc5t583.c+3−3
@@ -246,7 +246,7 @@ static const struct regmap_config rc5t583_regmap_config = { · 245 unmodified lines
246 .cache_type = REGCACHE_RBTREE,246 .cache_type = REGCACHE_RBTREE,
247};247};
248 248
249static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,249static int rc5t583_i2c_probe(struct i2c_client *i2c,
250 const struct i2c_device_id *id)250 const struct i2c_device_id *id)
251{251{
252 struct rc5t583 *rc5t583;252 struct rc5t583 *rc5t583;
@@ -303,7 +303,7 @@ err_add_devs: · 50 unmodified lines
303 return ret;303 return ret;
304}304}
305 305
306static int __devexit rc5t583_i2c_remove(struct i2c_client *i2c)306static int rc5t583_i2c_remove(struct i2c_client *i2c)
307{307{
308 struct rc5t583 *rc5t583 = i2c_get_clientdata(i2c);308 struct rc5t583 *rc5t583 = i2c_get_clientdata(i2c);
309 309
@@ -325,7 +325,7 @@ static struct i2c_driver rc5t583_i2c_driver = { · 15 unmodified lines
325 .owner = THIS_MODULE,325 .owner = THIS_MODULE,
326 },326 },
327 .probe = rc5t583_i2c_probe,327 .probe = rc5t583_i2c_probe,
328 .remove = __devexit_p(rc5t583_i2c_remove),328 .remove = rc5t583_i2c_remove,
329 .id_table = rc5t583_i2c_id,329 .id_table = rc5t583_i2c_id,
330};330};
331 331
drivers/mfd/rdc321x-southbridge.c+3−3
@@ -72,7 +72,7 @@ static struct mfd_cell rdc321x_sb_cells[] = { · 71 unmodified lines
72 },72 },
73};73};
74 74
75static int __devinit rdc321x_sb_probe(struct pci_dev *pdev,75static int rdc321x_sb_probe(struct pci_dev *pdev,
76 const struct pci_device_id *ent)76 const struct pci_device_id *ent)
77{77{
78 int err;78 int err;
@@ -91,7 +91,7 @@ static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, · 12 unmodified lines
91 NULL, 0, NULL);91 NULL, 0, NULL);
92}92}
93 93
94static void __devexit rdc321x_sb_remove(struct pci_dev *pdev)94static void rdc321x_sb_remove(struct pci_dev *pdev)
95{95{
96 mfd_remove_devices(&pdev->dev);96 mfd_remove_devices(&pdev->dev);
97}97}
@@ -106,7 +106,7 @@ static struct pci_driver rdc321x_sb_driver = { · 8 unmodified lines
106 .name = "RDC321x Southbridge",106 .name = "RDC321x Southbridge",
107 .id_table = rdc321x_sb_table,107 .id_table = rdc321x_sb_table,
108 .probe = rdc321x_sb_probe,108 .probe = rdc321x_sb_probe,
109 .remove = __devexit_p(rdc321x_sb_remove),109 .remove = rdc321x_sb_remove,
110};110};
111 111
112module_pci_driver(rdc321x_sb_driver);112module_pci_driver(rdc321x_sb_driver);
drivers/mfd/sm501.c+8−8
@@ -1014,7 +1014,7 @@ static struct gpio_chip gpio_chip_template = { · 1013 unmodified lines
1014 .get = sm501_gpio_get,1014 .get = sm501_gpio_get,
1015};1015};
1016 1016
1017static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,1017static int sm501_gpio_register_chip(struct sm501_devdata *sm,
1018 struct sm501_gpio *gpio,1018 struct sm501_gpio *gpio,
1019 struct sm501_gpio_chip *chip)1019 struct sm501_gpio_chip *chip)
1020{1020{
@@ -1042,7 +1042,7 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm, · 21 unmodified lines
1042 return gpiochip_add(gchip);1042 return gpiochip_add(gchip);
1043}1043}
1044 1044
1045static int __devinit sm501_register_gpio(struct sm501_devdata *sm)1045static int sm501_register_gpio(struct sm501_devdata *sm)
1046{1046{
1047 struct sm501_gpio *gpio = &sm->gpio;1047 struct sm501_gpio *gpio = &sm->gpio;
1048 resource_size_t iobase = sm->io_res->start + SM501_GPIO;1048 resource_size_t iobase = sm->io_res->start + SM501_GPIO;
@@ -1313,7 +1313,7 @@ static unsigned int sm501_mem_local[] = { · 264 unmodified lines
1313 * Common init code for an SM5011313 * Common init code for an SM501
1314*/1314*/
1315 1315
1316static int __devinit sm501_init_dev(struct sm501_devdata *sm)1316static int sm501_init_dev(struct sm501_devdata *sm)
1317{1317{
1318 struct sm501_initdata *idata;1318 struct sm501_initdata *idata;
1319 struct sm501_platdata *pdata;1319 struct sm501_platdata *pdata;
@@ -1389,7 +1389,7 @@ static int __devinit sm501_init_dev(struct sm501_devdata *sm) · 69 unmodified lines
1389 return 0;1389 return 0;
1390}1390}
1391 1391
1392static int __devinit sm501_plat_probe(struct platform_device *dev)1392static int sm501_plat_probe(struct platform_device *dev)
1393{1393{
1394 struct sm501_devdata *sm;1394 struct sm501_devdata *sm;
1395 int ret;1395 int ret;
@@ -1578,7 +1578,7 @@ static struct sm501_platdata sm501_pci_platdata = { · 182 unmodified lines
1578 .gpio_base = -1,1578 .gpio_base = -1,
1579};1579};
1580 1580
1581static int __devinit sm501_pci_probe(struct pci_dev *dev,1581static int sm501_pci_probe(struct pci_dev *dev,
1582 const struct pci_device_id *id)1582 const struct pci_device_id *id)
1583{1583{
1584 struct sm501_devdata *sm;1584 struct sm501_devdata *sm;
@@ -1685,7 +1685,7 @@ static void sm501_dev_remove(struct sm501_devdata *sm) · 100 unmodified lines
1685 sm501_gpio_remove(sm);1685 sm501_gpio_remove(sm);
1686}1686}
1687 1687
1688static void __devexit sm501_pci_remove(struct pci_dev *dev)1688static void sm501_pci_remove(struct pci_dev *dev)
1689{1689{
1690 struct sm501_devdata *sm = pci_get_drvdata(dev);1690 struct sm501_devdata *sm = pci_get_drvdata(dev);
1691 1691
@@ -1723,12 +1723,12 @@ static struct pci_driver sm501_pci_driver = { · 31 unmodified lines
1723 .name = "sm501",1723 .name = "sm501",
1724 .id_table = sm501_pci_tbl,1724 .id_table = sm501_pci_tbl,
1725 .probe = sm501_pci_probe,1725 .probe = sm501_pci_probe,
1726 .remove = __devexit_p(sm501_pci_remove),1726 .remove = sm501_pci_remove,
1727};1727};
1728 1728
1729MODULE_ALIAS("platform:sm501");1729MODULE_ALIAS("platform:sm501");
1730 1730
1731static struct of_device_id __devinitdata of_sm501_match_tbl[] = {1731static struct of_device_id of_sm501_match_tbl[] = {
1732 { .compatible = "smi,sm501", },1732 { .compatible = "smi,sm501", },
1733 { /* end */ }1733 { /* end */ }
1734};1734};
drivers/mfd/sta2x11-mfd.c+10−10
@@ -69,7 +69,7 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev) · 68 unmodified lines
69 return NULL;69 return NULL;
70}70}
71 71
72static int __devinit sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)72static int sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)
73{73{
74 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);74 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
75 struct sta2x11_instance *instance;75 struct sta2x11_instance *instance;
@@ -89,7 +89,7 @@ static int __devinit sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags) · 13 unmodified lines
89 return 0;89 return 0;
90}90}
91 91
92static int __devexit mfd_remove(struct pci_dev *pdev)92static int mfd_remove(struct pci_dev *pdev)
93{93{
94 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);94 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
95 95
@@ -305,7 +305,7 @@ enum bar1_cells { · 209 unmodified lines
305 .flags = IORESOURCE_MEM, \305 .flags = IORESOURCE_MEM, \
306 }306 }
307 307
308static const __devinitconst struct resource gpio_resources[] = {308static const struct resource gpio_resources[] = {
309 {309 {
310 .name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */310 .name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */
311 .start = 0,311 .start = 0,
@@ -313,31 +313,31 @@ static const __devinitconst struct resource gpio_resources[] = { · 1 unmodified line
313 .flags = IORESOURCE_MEM,313 .flags = IORESOURCE_MEM,
314 }314 }
315};315};
316static const __devinitconst struct resource sctl_resources[] = {316static const struct resource sctl_resources[] = {
317 CELL_4K("sta2x11-sctl", STA2X11_SCTL),317 CELL_4K("sta2x11-sctl", STA2X11_SCTL),
318};318};
319static const __devinitconst struct resource scr_resources[] = {319static const struct resource scr_resources[] = {
320 CELL_4K("sta2x11-scr", STA2X11_SCR),320 CELL_4K("sta2x11-scr", STA2X11_SCR),
321};321};
322static const __devinitconst struct resource time_resources[] = {322static const struct resource time_resources[] = {
323 CELL_4K("sta2x11-time", STA2X11_TIME),323 CELL_4K("sta2x11-time", STA2X11_TIME),
324};324};
325 325
326static const __devinitconst struct resource apbreg_resources[] = {326static const struct resource apbreg_resources[] = {
327 CELL_4K("sta2x11-apbreg", STA2X11_APBREG),327 CELL_4K("sta2x11-apbreg", STA2X11_APBREG),
328};328};
329 329
330#define DEV(_name, _r) \330#define DEV(_name, _r) \
331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
332 332
333static __devinitdata struct mfd_cell sta2x11_mfd_bar0[] = {333static struct mfd_cell sta2x11_mfd_bar0[] = {
334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */
335 DEV("sta2x11-sctl", sctl_resources),335 DEV("sta2x11-sctl", sctl_resources),
336 DEV("sta2x11-scr", scr_resources),336 DEV("sta2x11-scr", scr_resources),
337 DEV("sta2x11-time", time_resources),337 DEV("sta2x11-time", time_resources),
338};338};
339 339
340static __devinitdata struct mfd_cell sta2x11_mfd_bar1[] = {340static struct mfd_cell sta2x11_mfd_bar1[] = {
341 DEV("sta2x11-apbreg", apbreg_resources),341 DEV("sta2x11-apbreg", apbreg_resources),
342};342};
343 343
@@ -363,7 +363,7 @@ static int sta2x11_mfd_resume(struct pci_dev *pdev) · 19 unmodified lines
363 return 0;363 return 0;
364}364}
365 365
366static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev,366static int sta2x11_mfd_probe(struct pci_dev *pdev,
367 const struct pci_device_id *pci_id)367 const struct pci_device_id *pci_id)
368{368{
369 int err, i;369 int err, i;
drivers/mfd/stmpe-i2c.c+3−3
@@ -52,7 +52,7 @@ static struct stmpe_client_info i2c_ci = { · 51 unmodified lines
52 .write_block = i2c_block_write,52 .write_block = i2c_block_write,
53};53};
54 54
55static int __devinit55static int
56stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)56stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
57{57{
58 i2c_ci.data = (void *)id;58 i2c_ci.data = (void *)id;
@@ -63,7 +63,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) · 4 unmodified lines
63 return stmpe_probe(&i2c_ci, id->driver_data);63 return stmpe_probe(&i2c_ci, id->driver_data);
64}64}
65 65
66static int __devexit stmpe_i2c_remove(struct i2c_client *i2c)66static int stmpe_i2c_remove(struct i2c_client *i2c)
67{67{
68 struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);68 struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);
69 69
@@ -88,7 +88,7 @@ static struct i2c_driver stmpe_i2c_driver = { · 18 unmodified lines
88 .driver.pm = &stmpe_dev_pm_ops,88 .driver.pm = &stmpe_dev_pm_ops,
89#endif89#endif
90 .probe = stmpe_i2c_probe,90 .probe = stmpe_i2c_probe,
91 .remove = __devexit_p(stmpe_i2c_remove),91 .remove = stmpe_i2c_remove,
92 .id_table = stmpe_i2c_id,92 .id_table = stmpe_i2c_id,
93};93};
94 94
drivers/mfd/stmpe-spi.c+3−3
@@ -82,7 +82,7 @@ static struct stmpe_client_info spi_ci = { · 81 unmodified lines
82 .init = spi_init,82 .init = spi_init,
83};83};
84 84
85static int __devinit85static int
86stmpe_spi_probe(struct spi_device *spi)86stmpe_spi_probe(struct spi_device *spi)
87{87{
88 const struct spi_device_id *id = spi_get_device_id(spi);88 const struct spi_device_id *id = spi_get_device_id(spi);
@@ -101,7 +101,7 @@ stmpe_spi_probe(struct spi_device *spi) · 12 unmodified lines
101 return stmpe_probe(&spi_ci, id->driver_data);101 return stmpe_probe(&spi_ci, id->driver_data);
102}102}
103 103
104static int __devexit stmpe_spi_remove(struct spi_device *spi)104static int stmpe_spi_remove(struct spi_device *spi)
105{105{
106 struct stmpe *stmpe = dev_get_drvdata(&spi->dev);106 struct stmpe *stmpe = dev_get_drvdata(&spi->dev);
107 107
@@ -128,7 +128,7 @@ static struct spi_driver stmpe_spi_driver = { · 20 unmodified lines
128#endif128#endif
129 },129 },
130 .probe = stmpe_spi_probe,130 .probe = stmpe_spi_probe,
131 .remove = __devexit_p(stmpe_spi_remove),131 .remove = stmpe_spi_remove,
132 .id_table = stmpe_spi_id,132 .id_table = stmpe_spi_id,
133};133};
134 134
drivers/mfd/syscon.c+3−3
@@ -97,7 +97,7 @@ static struct regmap_config syscon_regmap_config = { · 96 unmodified lines
97 .reg_stride = 4,97 .reg_stride = 4,
98};98};
99 99
100static int __devinit syscon_probe(struct platform_device *pdev)100static int syscon_probe(struct platform_device *pdev)
101{101{
102 struct device *dev = &pdev->dev;102 struct device *dev = &pdev->dev;
103 struct device_node *np = dev->of_node;103 struct device_node *np = dev->of_node;
@@ -138,7 +138,7 @@ static int __devinit syscon_probe(struct platform_device *pdev) · 34 unmodified lines
138 return 0;138 return 0;
139}139}
140 140
141static int __devexit syscon_remove(struct platform_device *pdev)141static int syscon_remove(struct platform_device *pdev)
142{142{
143 struct syscon *syscon;143 struct syscon *syscon;
144 144
@@ -156,7 +156,7 @@ static struct platform_driver syscon_driver = { · 11 unmodified lines
156 .of_match_table = of_syscon_match,156 .of_match_table = of_syscon_match,
157 },157 },
158 .probe = syscon_probe,158 .probe = syscon_probe,
159 .remove = __devexit_p(syscon_remove),159 .remove = syscon_remove,
160};160};
161 161
162static int __init syscon_init(void)162static int __init syscon_init(void)
drivers/mfd/tc3589x.c+4−4
@@ -282,7 +282,7 @@ static int tc3589x_chip_init(struct tc3589x *tc3589x) · 281 unmodified lines
282 return tc3589x_reg_write(tc3589x, TC3589x_RSTINTCLR, 0x1);282 return tc3589x_reg_write(tc3589x, TC3589x_RSTINTCLR, 0x1);
283}283}
284 284
285static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)285static int tc3589x_device_init(struct tc3589x *tc3589x)
286{286{
287 int ret = 0;287 int ret = 0;
288 unsigned int blocks = tc3589x->pdata->block;288 unsigned int blocks = tc3589x->pdata->block;
@@ -329,7 +329,7 @@ static int tc3589x_of_probe(struct device_node *np, · 40 unmodified lines
329 return 0;329 return 0;
330}330}
331 331
332static int __devinit tc3589x_probe(struct i2c_client *i2c,332static int tc3589x_probe(struct i2c_client *i2c,
333 const struct i2c_device_id *id)333 const struct i2c_device_id *id)
334{334{
335 struct tc3589x_platform_data *pdata = i2c->dev.platform_data;335 struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
@@ -402,7 +402,7 @@ out_free: · 66 unmodified lines
402 return ret;402 return ret;
403}403}
404 404
405static int __devexit tc3589x_remove(struct i2c_client *client)405static int tc3589x_remove(struct i2c_client *client)
406{406{
407 struct tc3589x *tc3589x = i2c_get_clientdata(client);407 struct tc3589x *tc3589x = i2c_get_clientdata(client);
408 408
@@ -458,7 +458,7 @@ static struct i2c_driver tc3589x_driver = { · 49 unmodified lines
458 .driver.owner = THIS_MODULE,458 .driver.owner = THIS_MODULE,
459 .driver.pm = &tc3589x_dev_pm_ops,459 .driver.pm = &tc3589x_dev_pm_ops,
460 .probe = tc3589x_probe,460 .probe = tc3589x_probe,
461 .remove = __devexit_p(tc3589x_remove),461 .remove = tc3589x_remove,
462 .id_table = tc3589x_id,462 .id_table = tc3589x_id,
463};463};
464 464
drivers/mfd/tc6387xb.c+3−3
@@ -138,7 +138,7 @@ static struct mfd_cell tc6387xb_cells[] = { · 137 unmodified lines
138 },138 },
139};139};
140 140
141static int __devinit tc6387xb_probe(struct platform_device *dev)141static int tc6387xb_probe(struct platform_device *dev)
142{142{
143 struct tc6387xb_platform_data *pdata = dev->dev.platform_data;143 struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
144 struct resource *iomem, *rscr;144 struct resource *iomem, *rscr;
@@ -208,7 +208,7 @@ err_no_irq: · 63 unmodified lines
208 return ret;208 return ret;
209}209}
210 210
211static int __devexit tc6387xb_remove(struct platform_device *dev)211static int tc6387xb_remove(struct platform_device *dev)
212{212{
213 struct tc6387xb *tc6387xb = platform_get_drvdata(dev);213 struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
214 214
@@ -229,7 +229,7 @@ static struct platform_driver tc6387xb_platform_driver = { · 14 unmodified lines
229 .name = "tc6387xb",229 .name = "tc6387xb",
230 },230 },
231 .probe = tc6387xb_probe,231 .probe = tc6387xb_probe,
232 .remove = __devexit_p(tc6387xb_remove),232 .remove = tc6387xb_remove,
233 .suspend = tc6387xb_suspend,233 .suspend = tc6387xb_suspend,
234 .resume = tc6387xb_resume,234 .resume = tc6387xb_resume,
235};235};
drivers/mfd/tc6393xb.c+6−6
@@ -137,7 +137,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand) · 136 unmodified lines
137 return 0;137 return 0;
138}138}
139 139
140static struct resource __devinitdata tc6393xb_nand_resources[] = {140static struct resource tc6393xb_nand_resources[] = {
141 {141 {
142 .start = 0x1000,142 .start = 0x1000,
143 .end = 0x1007,143 .end = 0x1007,
@@ -196,7 +196,7 @@ static const struct resource tc6393xb_ohci_resources[] = { · 52 unmodified lines
196 },196 },
197};197};
198 198
199static struct resource __devinitdata tc6393xb_fb_resources[] = {199static struct resource tc6393xb_fb_resources[] = {
200 {200 {
201 .start = 0x5000,201 .start = 0x5000,
202 .end = 0x51ff,202 .end = 0x51ff,
@@ -382,7 +382,7 @@ static struct tmio_mmc_data tc6393xb_mmc_data = { · 179 unmodified lines
382 .set_clk_div = tc6393xb_mmc_clk_div,382 .set_clk_div = tc6393xb_mmc_clk_div,
383};383};
384 384
385static struct mfd_cell __devinitdata tc6393xb_cells[] = {385static struct mfd_cell tc6393xb_cells[] = {
386 [TC6393XB_CELL_NAND] = {386 [TC6393XB_CELL_NAND] = {
387 .name = "tmio-nand",387 .name = "tmio-nand",
388 .enable = tc6393xb_nand_enable,388 .enable = tc6393xb_nand_enable,
@@ -602,7 +602,7 @@ static void tc6393xb_detach_irq(struct platform_device *dev) · 213 unmodified lines
602 602
603/*--------------------------------------------------------------------------*/603/*--------------------------------------------------------------------------*/
604 604
605static int __devinit tc6393xb_probe(struct platform_device *dev)605static int tc6393xb_probe(struct platform_device *dev)
606{606{
607 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;607 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
608 struct tc6393xb *tc6393xb;608 struct tc6393xb *tc6393xb;
@@ -731,7 +731,7 @@ err_kzalloc: · 122 unmodified lines
731 return ret;731 return ret;
732}732}
733 733
734static int __devexit tc6393xb_remove(struct platform_device *dev)734static int tc6393xb_remove(struct platform_device *dev)
735{735{
736 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;736 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
737 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);737 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
@@ -831,7 +831,7 @@ static int tc6393xb_resume(struct platform_device *dev) · 93 unmodified lines
831 831
832static struct platform_driver tc6393xb_driver = {832static struct platform_driver tc6393xb_driver = {
833 .probe = tc6393xb_probe,833 .probe = tc6393xb_probe,
834 .remove = __devexit_p(tc6393xb_remove),834 .remove = tc6393xb_remove,
835 .suspend = tc6393xb_suspend,835 .suspend = tc6393xb_suspend,
836 .resume = tc6393xb_resume,836 .resume = tc6393xb_resume,
837 837
drivers/mfd/ti-ssp.c+3−3
@@ -315,7 +315,7 @@ static irqreturn_t ti_ssp_interrupt(int irq, void *dev_data) · 314 unmodified lines
315 return IRQ_HANDLED;315 return IRQ_HANDLED;
316}316}
317 317
318static int __devinit ti_ssp_probe(struct platform_device *pdev)318static int ti_ssp_probe(struct platform_device *pdev)
319{319{
320 static struct ti_ssp *ssp;320 static struct ti_ssp *ssp;
321 const struct ti_ssp_data *pdata = pdev->dev.platform_data;321 const struct ti_ssp_data *pdata = pdev->dev.platform_data;
@@ -433,7 +433,7 @@ error_res: · 111 unmodified lines
433 return error;433 return error;
434}434}
435 435
436static int __devexit ti_ssp_remove(struct platform_device *pdev)436static int ti_ssp_remove(struct platform_device *pdev)
437{437{
438 struct device *dev = &pdev->dev;438 struct device *dev = &pdev->dev;
439 struct ti_ssp *ssp = dev_get_drvdata(dev);439 struct ti_ssp *ssp = dev_get_drvdata(dev);
@@ -451,7 +451,7 @@ static int __devexit ti_ssp_remove(struct platform_device *pdev) · 11 unmodified lines
451 451
452static struct platform_driver ti_ssp_driver = {452static struct platform_driver ti_ssp_driver = {
453 .probe = ti_ssp_probe,453 .probe = ti_ssp_probe,
454 .remove = __devexit_p(ti_ssp_remove),454 .remove = ti_ssp_remove,
455 .driver = {455 .driver = {
456 .name = "ti-ssp",456 .name = "ti-ssp",
457 .owner = THIS_MODULE,457 .owner = THIS_MODULE,
drivers/mfd/timberdale.c+32−32
@@ -75,13 +75,13 @@ static struct i2c_board_info timberdale_i2c_board_info[] = { · 74 unmodified lines
75 },75 },
76};76};
77 77
78static __devinitdata struct xiic_i2c_platform_data78static struct xiic_i2c_platform_data
79timberdale_xiic_platform_data = {79timberdale_xiic_platform_data = {
80 .devices = timberdale_i2c_board_info,80 .devices = timberdale_i2c_board_info,
81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
82};82};
83 83
84static __devinitdata struct ocores_i2c_platform_data84static struct ocores_i2c_platform_data
85timberdale_ocores_platform_data = {85timberdale_ocores_platform_data = {
86 .reg_shift = 2,86 .reg_shift = 2,
87 .clock_khz = 62500,87 .clock_khz = 62500,
@@ -89,7 +89,7 @@ timberdale_ocores_platform_data = { · 1 unmodified line
89 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)89 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
90};90};
91 91
92static const __devinitconst struct resource timberdale_xiic_resources[] = {92static const struct resource timberdale_xiic_resources[] = {
93 {93 {
94 .start = XIICOFFSET,94 .start = XIICOFFSET,
95 .end = XIICEND,95 .end = XIICEND,
@@ -102,7 +102,7 @@ static const __devinitconst struct resource timberdale_xiic_resources[] = { · 6 unmodified lines
102 },102 },
103};103};
104 104
105static const __devinitconst struct resource timberdale_ocores_resources[] = {105static const struct resource timberdale_ocores_resources[] = {
106 {106 {
107 .start = OCORESOFFSET,107 .start = OCORESOFFSET,
108 .end = OCORESEND,108 .end = OCORESEND,
@@ -143,7 +143,7 @@ static struct spi_board_info timberdale_spi_8bit_board_info[] = { · 34 unmodified lines
143 },143 },
144};144};
145 145
146static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = {146static struct xspi_platform_data timberdale_xspi_platform_data = {
147 .num_chipselect = 3,147 .num_chipselect = 3,
148 .little_endian = true,148 .little_endian = true,
149 /* bits per word and devices will be filled in runtime depending149 /* bits per word and devices will be filled in runtime depending
@@ -151,7 +151,7 @@ static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { · 1 unmodified line
151 */151 */
152};152};
153 153
154static const __devinitconst struct resource timberdale_spi_resources[] = {154static const struct resource timberdale_spi_resources[] = {
155 {155 {
156 .start = SPIOFFSET,156 .start = SPIOFFSET,
157 .end = SPIEND,157 .end = SPIEND,
@@ -164,13 +164,13 @@ static const __devinitconst struct resource timberdale_spi_resources[] = { · 6 unmodified lines
164 },164 },
165};165};
166 166
167static __devinitdata struct ks8842_platform_data167static struct ks8842_platform_data
168 timberdale_ks8842_platform_data = {168 timberdale_ks8842_platform_data = {
169 .rx_dma_channel = DMA_ETH_RX,169 .rx_dma_channel = DMA_ETH_RX,
170 .tx_dma_channel = DMA_ETH_TX170 .tx_dma_channel = DMA_ETH_TX
171};171};
172 172
173static const __devinitconst struct resource timberdale_eth_resources[] = {173static const struct resource timberdale_eth_resources[] = {
174 {174 {
175 .start = ETHOFFSET,175 .start = ETHOFFSET,
176 .end = ETHEND,176 .end = ETHEND,
@@ -183,14 +183,14 @@ static const __devinitconst struct resource timberdale_eth_resources[] = { · 6 unmodified lines
183 },183 },
184};184};
185 185
186static __devinitdata struct timbgpio_platform_data186static struct timbgpio_platform_data
187 timberdale_gpio_platform_data = {187 timberdale_gpio_platform_data = {
188 .gpio_base = 0,188 .gpio_base = 0,
189 .nr_pins = GPIO_NR_PINS,189 .nr_pins = GPIO_NR_PINS,
190 .irq_base = 200,190 .irq_base = 200,
191};191};
192 192
193static const __devinitconst struct resource timberdale_gpio_resources[] = {193static const struct resource timberdale_gpio_resources[] = {
194 {194 {
195 .start = GPIOOFFSET,195 .start = GPIOOFFSET,
196 .end = GPIOEND,196 .end = GPIOEND,
@@ -203,7 +203,7 @@ static const __devinitconst struct resource timberdale_gpio_resources[] = { · 6 unmodified lines
203 },203 },
204};204};
205 205
206static const __devinitconst struct resource timberdale_mlogicore_resources[] = {206static const struct resource timberdale_mlogicore_resources[] = {
207 {207 {
208 .start = MLCOREOFFSET,208 .start = MLCOREOFFSET,
209 .end = MLCOREEND,209 .end = MLCOREEND,
@@ -221,7 +221,7 @@ static const __devinitconst struct resource timberdale_mlogicore_resources[] = { · 11 unmodified lines
221 },221 },
222};222};
223 223
224static const __devinitconst struct resource timberdale_uart_resources[] = {224static const struct resource timberdale_uart_resources[] = {
225 {225 {
226 .start = UARTOFFSET,226 .start = UARTOFFSET,
227 .end = UARTEND,227 .end = UARTEND,
@@ -234,7 +234,7 @@ static const __devinitconst struct resource timberdale_uart_resources[] = { · 6 unmodified lines
234 },234 },
235};235};
236 236
237static const __devinitconst struct resource timberdale_uartlite_resources[] = {237static const struct resource timberdale_uartlite_resources[] = {
238 {238 {
239 .start = UARTLITEOFFSET,239 .start = UARTLITEOFFSET,
240 .end = UARTLITEEND,240 .end = UARTLITEEND,
@@ -247,13 +247,13 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = { · 6 unmodified lines
247 },247 },
248};248};
249 249
250static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = {250static struct i2c_board_info timberdale_adv7180_i2c_board_info = {
251 /* Requires jumper JP9 to be off */251 /* Requires jumper JP9 to be off */
252 I2C_BOARD_INFO("adv7180", 0x42 >> 1),252 I2C_BOARD_INFO("adv7180", 0x42 >> 1),
253 .irq = IRQ_TIMBERDALE_ADV7180253 .irq = IRQ_TIMBERDALE_ADV7180
254};254};
255 255
256static __devinitdata struct timb_video_platform_data256static struct timb_video_platform_data
257 timberdale_video_platform_data = {257 timberdale_video_platform_data = {
258 .dma_channel = DMA_VIDEO_RX,258 .dma_channel = DMA_VIDEO_RX,
259 .i2c_adapter = 0,259 .i2c_adapter = 0,
@@ -262,7 +262,7 @@ static __devinitdata struct timb_video_platform_data · 2 unmodified lines
262 }262 }
263};263};
264 264
265static const __devinitconst struct resource265static const struct resource
266timberdale_radio_resources[] = {266timberdale_radio_resources[] = {
267 {267 {
268 .start = RDSOFFSET,268 .start = RDSOFFSET,
@@ -276,22 +276,22 @@ timberdale_radio_resources[] = { · 7 unmodified lines
276 },276 },
277};277};
278 278
279static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = {279static struct i2c_board_info timberdale_tef6868_i2c_board_info = {
280 I2C_BOARD_INFO("tef6862", 0x60)280 I2C_BOARD_INFO("tef6862", 0x60)
281};281};
282 282
283static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = {283static struct i2c_board_info timberdale_saa7706_i2c_board_info = {
284 I2C_BOARD_INFO("saa7706h", 0x1C)284 I2C_BOARD_INFO("saa7706h", 0x1C)
285};285};
286 286
287static __devinitdata struct timb_radio_platform_data287static struct timb_radio_platform_data
288 timberdale_radio_platform_data = {288 timberdale_radio_platform_data = {
289 .i2c_adapter = 0,289 .i2c_adapter = 0,
290 .tuner = &timberdale_tef6868_i2c_board_info,290 .tuner = &timberdale_tef6868_i2c_board_info,
291 .dsp = &timberdale_saa7706_i2c_board_info291 .dsp = &timberdale_saa7706_i2c_board_info
292};292};
293 293
294static const __devinitconst struct resource timberdale_video_resources[] = {294static const struct resource timberdale_video_resources[] = {
295 {295 {
296 .start = LOGIWOFFSET,296 .start = LOGIWOFFSET,
297 .end = LOGIWEND,297 .end = LOGIWEND,
@@ -303,7 +303,7 @@ static const __devinitconst struct resource timberdale_video_resources[] = { · 5 unmodified lines
303 */303 */
304};304};
305 305
306static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = {306static struct timb_dma_platform_data timb_dma_platform_data = {
307 .nr_channels = 10,307 .nr_channels = 10,
308 .channels = {308 .channels = {
309 {309 {
@@ -362,7 +362,7 @@ static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { · 52 unmodified lines
362 }362 }
363};363};
364 364
365static const __devinitconst struct resource timberdale_dma_resources[] = {365static const struct resource timberdale_dma_resources[] = {
366 {366 {
367 .start = DMAOFFSET,367 .start = DMAOFFSET,
368 .end = DMAEND,368 .end = DMAEND,
@@ -375,7 +375,7 @@ static const __devinitconst struct resource timberdale_dma_resources[] = { · 6 unmodified lines
375 },375 },
376};376};
377 377
378static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {378static struct mfd_cell timberdale_cells_bar0_cfg0[] = {
379 {379 {
380 .name = "timb-dma",380 .name = "timb-dma",
381 .num_resources = ARRAY_SIZE(timberdale_dma_resources),381 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -432,7 +432,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { · 50 unmodified lines
432 },432 },
433};433};
434 434
435static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {435static struct mfd_cell timberdale_cells_bar0_cfg1[] = {
436 {436 {
437 .name = "timb-dma",437 .name = "timb-dma",
438 .num_resources = ARRAY_SIZE(timberdale_dma_resources),438 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -499,7 +499,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { · 60 unmodified lines
499 },499 },
500};500};
501 501
502static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {502static struct mfd_cell timberdale_cells_bar0_cfg2[] = {
503 {503 {
504 .name = "timb-dma",504 .name = "timb-dma",
505 .num_resources = ARRAY_SIZE(timberdale_dma_resources),505 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -549,7 +549,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { · 43 unmodified lines
549 },549 },
550};550};
551 551
552static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {552static struct mfd_cell timberdale_cells_bar0_cfg3[] = {
553 {553 {
554 .name = "timb-dma",554 .name = "timb-dma",
555 .num_resources = ARRAY_SIZE(timberdale_dma_resources),555 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -606,7 +606,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { · 50 unmodified lines
606 },606 },
607};607};
608 608
609static const __devinitconst struct resource timberdale_sdhc_resources[] = {609static const struct resource timberdale_sdhc_resources[] = {
610 /* located in bar 1 and bar 2 */610 /* located in bar 1 and bar 2 */
611 {611 {
612 .start = SDHC0OFFSET,612 .start = SDHC0OFFSET,
@@ -620,7 +620,7 @@ static const __devinitconst struct resource timberdale_sdhc_resources[] = { · 7 unmodified lines
620 },620 },
621};621};
622 622
623static __devinitdata struct mfd_cell timberdale_cells_bar1[] = {623static struct mfd_cell timberdale_cells_bar1[] = {
624 {624 {
625 .name = "sdhci",625 .name = "sdhci",
626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
@@ -628,7 +628,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { · 1 unmodified line
628 },628 },
629};629};
630 630
631static __devinitdata struct mfd_cell timberdale_cells_bar2[] = {631static struct mfd_cell timberdale_cells_bar2[] = {
632 {632 {
633 .name = "sdhci",633 .name = "sdhci",
634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
@@ -650,7 +650,7 @@ static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL); · 15 unmodified lines
650 650
651/*--------------------------------------------------------------------------*/651/*--------------------------------------------------------------------------*/
652 652
653static int __devinit timb_probe(struct pci_dev *dev,653static int timb_probe(struct pci_dev *dev,
654 const struct pci_device_id *id)654 const struct pci_device_id *id)
655{655{
656 struct timberdale_device *priv;656 struct timberdale_device *priv;
@@ -840,7 +840,7 @@ err_enable: · 183 unmodified lines
840 return -ENODEV;840 return -ENODEV;
841}841}
842 842
843static void __devexit timb_remove(struct pci_dev *dev)843static void timb_remove(struct pci_dev *dev)
844{844{
845 struct timberdale_device *priv = pci_get_drvdata(dev);845 struct timberdale_device *priv = pci_get_drvdata(dev);
846 846
@@ -867,7 +867,7 @@ static struct pci_driver timberdale_pci_driver = { · 20 unmodified lines
867 .name = DRIVER_NAME,867 .name = DRIVER_NAME,
868 .id_table = timberdale_pci_tbl,868 .id_table = timberdale_pci_tbl,
869 .probe = timb_probe,869 .probe = timb_probe,
870 .remove = __devexit_p(timb_remove),870 .remove = timb_remove,
871};871};
872 872
873static int __init timberdale_init(void)873static int __init timberdale_init(void)
drivers/mfd/tps6105x.c+4−4
@@ -86,7 +86,7 @@ fail: · 85 unmodified lines
86}86}
87EXPORT_SYMBOL(tps6105x_mask_and_set);87EXPORT_SYMBOL(tps6105x_mask_and_set);
88 88
89static int __devinit tps6105x_startup(struct tps6105x *tps6105x)89static int tps6105x_startup(struct tps6105x *tps6105x)
90{90{
91 int ret;91 int ret;
92 u8 regval;92 u8 regval;
@@ -133,7 +133,7 @@ static struct mfd_cell tps6105x_cells[] = { · 40 unmodified lines
133 },133 },
134};134};
135 135
136static int __devinit tps6105x_probe(struct i2c_client *client,136static int tps6105x_probe(struct i2c_client *client,
137 const struct i2c_device_id *id)137 const struct i2c_device_id *id)
138{138{
139 struct tps6105x *tps6105x;139 struct tps6105x *tps6105x;
@@ -199,7 +199,7 @@ fail: · 59 unmodified lines
199 return ret;199 return ret;
200}200}
201 201
202static int __devexit tps6105x_remove(struct i2c_client *client)202static int tps6105x_remove(struct i2c_client *client)
203{203{
204 struct tps6105x *tps6105x = i2c_get_clientdata(client);204 struct tps6105x *tps6105x = i2c_get_clientdata(client);
205 205
@@ -226,7 +226,7 @@ static struct i2c_driver tps6105x_driver = { · 20 unmodified lines
226 .name = "tps6105x",226 .name = "tps6105x",
227 },227 },
228 .probe = tps6105x_probe,228 .probe = tps6105x_probe,
229 .remove = __devexit_p(tps6105x_remove),229 .remove = tps6105x_remove,
230 .id_table = tps6105x_id,230 .id_table = tps6105x_id,
231};231};
232 232
drivers/mfd/tps65090.c+4−4
@@ -188,7 +188,7 @@ static irqreturn_t tps65090_irq(int irq, void *data) · 187 unmodified lines
188 return acks ? IRQ_HANDLED : IRQ_NONE;188 return acks ? IRQ_HANDLED : IRQ_NONE;
189}189}
190 190
191static int __devinit tps65090_irq_init(struct tps65090 *tps65090, int irq,191static int tps65090_irq_init(struct tps65090 *tps65090, int irq,
192 int irq_base)192 int irq_base)
193{193{
194 int i, ret;194 int i, ret;
@@ -251,7 +251,7 @@ static const struct regmap_config tps65090_regmap_config = { · 56 unmodified lines
251 .volatile_reg = is_volatile_reg,251 .volatile_reg = is_volatile_reg,
252};252};
253 253
254static int __devinit tps65090_i2c_probe(struct i2c_client *client,254static int tps65090_i2c_probe(struct i2c_client *client,
255 const struct i2c_device_id *id)255 const struct i2c_device_id *id)
256{256{
257 struct tps65090_platform_data *pdata = client->dev.platform_data;257 struct tps65090_platform_data *pdata = client->dev.platform_data;
@@ -308,7 +308,7 @@ err_exit: · 50 unmodified lines
308 return ret;308 return ret;
309}309}
310 310
311static int __devexit tps65090_i2c_remove(struct i2c_client *client)311static int tps65090_i2c_remove(struct i2c_client *client)
312{312{
313 struct tps65090 *tps65090 = i2c_get_clientdata(client);313 struct tps65090 *tps65090 = i2c_get_clientdata(client);
314 314
@@ -354,7 +354,7 @@ static struct i2c_driver tps65090_driver = { · 39 unmodified lines
354 .pm = &tps65090_pm_ops,354 .pm = &tps65090_pm_ops,
355 },355 },
356 .probe = tps65090_i2c_probe,356 .probe = tps65090_i2c_probe,
357 .remove = __devexit_p(tps65090_i2c_remove),357 .remove = tps65090_i2c_remove,
358 .id_table = tps65090_id_table,358 .id_table = tps65090_id_table,
359};359};
360 360
drivers/mfd/tps65217.c+3−3
@@ -153,7 +153,7 @@ static const struct of_device_id tps65217_of_match[] = { · 152 unmodified lines
153 { /* sentinel */ },153 { /* sentinel */ },
154};154};
155 155
156static int __devinit tps65217_probe(struct i2c_client *client,156static int tps65217_probe(struct i2c_client *client,
157 const struct i2c_device_id *ids)157 const struct i2c_device_id *ids)
158{158{
159 struct tps65217 *tps;159 struct tps65217 *tps;
@@ -214,7 +214,7 @@ static int __devinit tps65217_probe(struct i2c_client *client, · 54 unmodified lines
214 return 0;214 return 0;
215}215}
216 216
217static int __devexit tps65217_remove(struct i2c_client *client)217static int tps65217_remove(struct i2c_client *client)
218{218{
219 struct tps65217 *tps = i2c_get_clientdata(client);219 struct tps65217 *tps = i2c_get_clientdata(client);
220 220
@@ -237,7 +237,7 @@ static struct i2c_driver tps65217_driver = { · 16 unmodified lines
237 },237 },
238 .id_table = tps65217_id_table,238 .id_table = tps65217_id_table,
239 .probe = tps65217_probe,239 .probe = tps65217_probe,
240 .remove = __devexit_p(tps65217_remove),240 .remove = tps65217_remove,
241};241};
242 242
243static int __init tps65217_init(void)243static int __init tps65217_init(void)
drivers/mfd/tps6586x.c+5−5
@@ -267,7 +267,7 @@ static irqreturn_t tps6586x_irq(int irq, void *data) · 266 unmodified lines
267 return IRQ_HANDLED;267 return IRQ_HANDLED;
268}268}
269 269
270static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,270static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
271 int irq_base)271 int irq_base)
272{272{
273 int i, ret;273 int i, ret;
@@ -316,7 +316,7 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq, · 42 unmodified lines
316 return ret;316 return ret;
317}317}
318 318
319static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,319static int tps6586x_add_subdevs(struct tps6586x *tps6586x,
320 struct tps6586x_platform_data *pdata)320 struct tps6586x_platform_data *pdata)
321{321{
322 struct tps6586x_subdev_info *subdev;322 struct tps6586x_subdev_info *subdev;
@@ -468,7 +468,7 @@ static void tps6586x_power_off(void) · 145 unmodified lines
468 tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);468 tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
469}469}
470 470
471static int __devinit tps6586x_i2c_probe(struct i2c_client *client,471static int tps6586x_i2c_probe(struct i2c_client *client,
472 const struct i2c_device_id *id)472 const struct i2c_device_id *id)
473{473{
474 struct tps6586x_platform_data *pdata = client->dev.platform_data;474 struct tps6586x_platform_data *pdata = client->dev.platform_data;
@@ -548,7 +548,7 @@ err_mfd_add: · 73 unmodified lines
548 return ret;548 return ret;
549}549}
550 550
551static int __devexit tps6586x_i2c_remove(struct i2c_client *client)551static int tps6586x_i2c_remove(struct i2c_client *client)
552{552{
553 struct tps6586x *tps6586x = i2c_get_clientdata(client);553 struct tps6586x *tps6586x = i2c_get_clientdata(client);
554 554
@@ -572,7 +572,7 @@ static struct i2c_driver tps6586x_driver = { · 17 unmodified lines
572 .of_match_table = of_match_ptr(tps6586x_of_match),572 .of_match_table = of_match_ptr(tps6586x_of_match),
573 },573 },
574 .probe = tps6586x_i2c_probe,574 .probe = tps6586x_i2c_probe,
575 .remove = __devexit_p(tps6586x_i2c_remove),575 .remove = tps6586x_i2c_remove,
576 .id_table = tps6586x_id_table,576 .id_table = tps6586x_id_table,
577};577};
578 578
drivers/mfd/tps65910.c+5−5
@@ -78,7 +78,7 @@ static const struct regmap_config tps65910_regmap_config = { · 77 unmodified lines
78 .cache_type = REGCACHE_RBTREE,78 .cache_type = REGCACHE_RBTREE,
79};79};
80 80
81static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910,81static int tps65910_ck32k_init(struct tps65910 *tps65910,
82 struct tps65910_board *pmic_pdata)82 struct tps65910_board *pmic_pdata)
83{83{
84 int ret;84 int ret;
@@ -96,7 +96,7 @@ static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910, · 11 unmodified lines
96 return 0;96 return 0;
97}97}
98 98
99static int __devinit tps65910_sleepinit(struct tps65910 *tps65910,99static int tps65910_sleepinit(struct tps65910 *tps65910,
100 struct tps65910_board *pmic_pdata)100 struct tps65910_board *pmic_pdata)
101{101{
102 struct device *dev = NULL;102 struct device *dev = NULL;
@@ -237,7 +237,7 @@ static void tps65910_power_off(void) · 134 unmodified lines
237 DEVCTRL_DEV_ON_MASK);237 DEVCTRL_DEV_ON_MASK);
238}238}
239 239
240static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,240static int tps65910_i2c_probe(struct i2c_client *i2c,
241 const struct i2c_device_id *id)241 const struct i2c_device_id *id)
242{242{
243 struct tps65910 *tps65910;243 struct tps65910 *tps65910;
@@ -302,7 +302,7 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c, · 58 unmodified lines
302 return ret;302 return ret;
303}303}
304 304
305static __devexit int tps65910_i2c_remove(struct i2c_client *i2c)305static int tps65910_i2c_remove(struct i2c_client *i2c)
306{306{
307 struct tps65910 *tps65910 = i2c_get_clientdata(i2c);307 struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
308 308
@@ -327,7 +327,7 @@ static struct i2c_driver tps65910_i2c_driver = { · 18 unmodified lines
327 .of_match_table = of_match_ptr(tps65910_of_match),327 .of_match_table = of_match_ptr(tps65910_of_match),
328 },328 },
329 .probe = tps65910_i2c_probe,329 .probe = tps65910_i2c_probe,
330 .remove = __devexit_p(tps65910_i2c_remove),330 .remove = tps65910_i2c_remove,
331 .id_table = tps65910_i2c_id,331 .id_table = tps65910_i2c_id,
332};332};
333 333
drivers/mfd/tps65911-comparator.c+3−3
@@ -122,7 +122,7 @@ static ssize_t comp_threshold_show(struct device *dev, · 121 unmodified lines
122static DEVICE_ATTR(comp1_threshold, S_IRUGO, comp_threshold_show, NULL);122static DEVICE_ATTR(comp1_threshold, S_IRUGO, comp_threshold_show, NULL);
123static DEVICE_ATTR(comp2_threshold, S_IRUGO, comp_threshold_show, NULL);123static DEVICE_ATTR(comp2_threshold, S_IRUGO, comp_threshold_show, NULL);
124 124
125static __devinit int tps65911_comparator_probe(struct platform_device *pdev)125static int tps65911_comparator_probe(struct platform_device *pdev)
126{126{
127 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);127 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
128 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);128 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);
@@ -152,7 +152,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev) · 23 unmodified lines
152 return ret;152 return ret;
153}153}
154 154
155static __devexit int tps65911_comparator_remove(struct platform_device *pdev)155static int tps65911_comparator_remove(struct platform_device *pdev)
156{156{
157 struct tps65910 *tps65910;157 struct tps65910 *tps65910;
158 158
@@ -169,7 +169,7 @@ static struct platform_driver tps65911_comparator_driver = { · 10 unmodified lines
169 .owner = THIS_MODULE,169 .owner = THIS_MODULE,
170 },170 },
171 .probe = tps65911_comparator_probe,171 .probe = tps65911_comparator_probe,
172 .remove = __devexit_p(tps65911_comparator_remove),172 .remove = tps65911_comparator_remove,
173};173};
174 174
175static int __init tps65911_comparator_init(void)175static int __init tps65911_comparator_init(void)
drivers/mfd/tps65912-spi.c+3−3
@@ -81,7 +81,7 @@ static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr, · 80 unmodified lines
81 return ret;81 return ret;
82}82}
83 83
84static int __devinit tps65912_spi_probe(struct spi_device *spi)84static int tps65912_spi_probe(struct spi_device *spi)
85{85{
86 struct tps65912 *tps65912;86 struct tps65912 *tps65912;
87 87
@@ -99,7 +99,7 @@ static int __devinit tps65912_spi_probe(struct spi_device *spi) · 11 unmodified lines
99 return tps65912_device_init(tps65912);99 return tps65912_device_init(tps65912);
100}100}
101 101
102static int __devexit tps65912_spi_remove(struct spi_device *spi)102static int tps65912_spi_remove(struct spi_device *spi)
103{103{
104 struct tps65912 *tps65912 = spi_get_drvdata(spi);104 struct tps65912 *tps65912 = spi_get_drvdata(spi);
105 105
@@ -114,7 +114,7 @@ static struct spi_driver tps65912_spi_driver = { · 8 unmodified lines
114 .owner = THIS_MODULE,114 .owner = THIS_MODULE,
115 },115 },
116 .probe = tps65912_spi_probe,116 .probe = tps65912_spi_probe,
117 .remove = __devexit_p(tps65912_spi_remove),117 .remove = tps65912_spi_remove,
118};118};
119 119
120static int __init tps65912_spi_init(void)120static int __init tps65912_spi_init(void)
drivers/mfd/twl-core.c+1−1
@@ -1170,7 +1170,7 @@ static int twl_remove(struct i2c_client *client) · 1169 unmodified lines
1170}1170}
1171 1171
1172/* NOTE: This driver only handles a single twl4030/tps659x0 chip */1172/* NOTE: This driver only handles a single twl4030/tps659x0 chip */
1173static int __devinit1173static int
1174twl_probe(struct i2c_client *client, const struct i2c_device_id *id)1174twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
1175{1175{
1176 struct twl4030_platform_data *pdata = client->dev.platform_data;1176 struct twl4030_platform_data *pdata = client->dev.platform_data;
drivers/mfd/twl4030-audio.c+3−3
@@ -184,7 +184,7 @@ static bool twl4030_audio_has_vibra(struct twl4030_audio_data *pdata, · 183 unmodified lines
184 return false;184 return false;
185}185}
186 186
187static int __devinit twl4030_audio_probe(struct platform_device *pdev)187static int twl4030_audio_probe(struct platform_device *pdev)
188{188{
189 struct twl4030_audio *audio;189 struct twl4030_audio *audio;
190 struct twl4030_audio_data *pdata = pdev->dev.platform_data;190 struct twl4030_audio_data *pdata = pdev->dev.platform_data;
@@ -269,7 +269,7 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) · 78 unmodified lines
269 return ret;269 return ret;
270}270}
271 271
272static int __devexit twl4030_audio_remove(struct platform_device *pdev)272static int twl4030_audio_remove(struct platform_device *pdev)
273{273{
274 mfd_remove_devices(&pdev->dev);274 mfd_remove_devices(&pdev->dev);
275 platform_set_drvdata(pdev, NULL);275 platform_set_drvdata(pdev, NULL);
@@ -291,7 +291,7 @@ static struct platform_driver twl4030_audio_driver = { · 15 unmodified lines
291 .of_match_table = twl4030_audio_of_match,291 .of_match_table = twl4030_audio_of_match,
292 },292 },
293 .probe = twl4030_audio_probe,293 .probe = twl4030_audio_probe,
294 .remove = __devexit_p(twl4030_audio_remove),294 .remove = twl4030_audio_remove,
295};295};
296 296
297module_platform_driver(twl4030_audio_driver);297module_platform_driver(twl4030_audio_driver);
drivers/mfd/twl4030-madc.c+2−2
@@ -692,7 +692,7 @@ static int twl4030_madc_set_power(struct twl4030_madc_data *madc, int on) · 691 unmodified lines
692/*692/*
693 * Initialize MADC and request for threaded irq693 * Initialize MADC and request for threaded irq
694 */694 */
695static int __devinit twl4030_madc_probe(struct platform_device *pdev)695static int twl4030_madc_probe(struct platform_device *pdev)
696{696{
697 struct twl4030_madc_data *madc;697 struct twl4030_madc_data *madc;
698 struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data;698 struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data;
@@ -785,7 +785,7 @@ err_power: · 86 unmodified lines
785 return ret;785 return ret;
786}786}
787 787
788static int __devexit twl4030_madc_remove(struct platform_device *pdev)788static int twl4030_madc_remove(struct platform_device *pdev)
789{789{
790 struct twl4030_madc_data *madc = platform_get_drvdata(pdev);790 struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
791 791
drivers/mfd/twl4030-power.c+10−10
@@ -124,7 +124,7 @@ static u8 res_config_addrs[] = { · 123 unmodified lines
124 [RES_MAIN_REF] = 0x94,124 [RES_MAIN_REF] = 0x94,
125};125};
126 126
127static int __devinit twl4030_write_script_byte(u8 address, u8 byte)127static int twl4030_write_script_byte(u8 address, u8 byte)
128{128{
129 int err;129 int err;
130 130
@@ -138,7 +138,7 @@ out: · 7 unmodified lines
138 return err;138 return err;
139}139}
140 140
141static int __devinit twl4030_write_script_ins(u8 address, u16 pmb_message,141static int twl4030_write_script_ins(u8 address, u16 pmb_message,
142 u8 delay, u8 next)142 u8 delay, u8 next)
143{143{
144 int err;144 int err;
@@ -158,7 +158,7 @@ out: · 13 unmodified lines
158 return err;158 return err;
159}159}
160 160
161static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script,161static int twl4030_write_script(u8 address, struct twl4030_ins *script,
162 int len)162 int len)
163{163{
164 int err;164 int err;
@@ -183,7 +183,7 @@ static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script · 18 unmodified lines
183 return err;183 return err;
184}184}
185 185
186static int __devinit twl4030_config_wakeup3_sequence(u8 address)186static int twl4030_config_wakeup3_sequence(u8 address)
187{187{
188 int err;188 int err;
189 u8 data;189 u8 data;
@@ -208,7 +208,7 @@ out: · 18 unmodified lines
208 return err;208 return err;
209}209}
210 210
211static int __devinit twl4030_config_wakeup12_sequence(u8 address)211static int twl4030_config_wakeup12_sequence(u8 address)
212{212{
213 int err = 0;213 int err = 0;
214 u8 data;214 u8 data;
@@ -262,7 +262,7 @@ out: · 47 unmodified lines
262 return err;262 return err;
263}263}
264 264
265static int __devinit twl4030_config_sleep_sequence(u8 address)265static int twl4030_config_sleep_sequence(u8 address)
266{266{
267 int err;267 int err;
268 268
@@ -276,7 +276,7 @@ static int __devinit twl4030_config_sleep_sequence(u8 address) · 7 unmodified lines
276 return err;276 return err;
277}277}
278 278
279static int __devinit twl4030_config_warmreset_sequence(u8 address)279static int twl4030_config_warmreset_sequence(u8 address)
280{280{
281 int err;281 int err;
282 u8 rd_data;282 u8 rd_data;
@@ -324,7 +324,7 @@ out: · 41 unmodified lines
324 return err;324 return err;
325}325}
326 326
327static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfig)327static int twl4030_configure_resource(struct twl4030_resconfig *rconfig)
328{328{
329 int rconfig_addr;329 int rconfig_addr;
330 int err;330 int err;
@@ -416,7 +416,7 @@ static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfi · 85 unmodified lines
416 return 0;416 return 0;
417}417}
418 418
419static int __devinit load_twl4030_script(struct twl4030_script *tscript,419static int load_twl4030_script(struct twl4030_script *tscript,
420 u8 address)420 u8 address)
421{421{
422 int err;422 int err;
@@ -527,7 +527,7 @@ void twl4030_power_off(void) · 104 unmodified lines
527 pr_err("TWL4030 Unable to power off\n");527 pr_err("TWL4030 Unable to power off\n");
528}528}
529 529
530void __devinit twl4030_power_init(struct twl4030_power_data *twl4030_scripts)530void twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
531{531{
532 int err = 0;532 int err = 0;
533 int i;533 int i;
drivers/mfd/vx855.c+3−3
@@ -72,7 +72,7 @@ static struct mfd_cell vx855_cells[] = { · 71 unmodified lines
72 },72 },
73};73};
74 74
75static __devinit int vx855_probe(struct pci_dev *pdev,75static int vx855_probe(struct pci_dev *pdev,
76 const struct pci_device_id *id)76 const struct pci_device_id *id)
77{77{
78 int ret;78 int ret;
@@ -112,7 +112,7 @@ out: · 33 unmodified lines
112 return ret;112 return ret;
113}113}
114 114
115static void __devexit vx855_remove(struct pci_dev *pdev)115static void vx855_remove(struct pci_dev *pdev)
116{116{
117 mfd_remove_devices(&pdev->dev);117 mfd_remove_devices(&pdev->dev);
118 pci_disable_device(pdev);118 pci_disable_device(pdev);
@@ -128,7 +128,7 @@ static struct pci_driver vx855_pci_driver = { · 9 unmodified lines
128 .name = "vx855",128 .name = "vx855",
129 .id_table = vx855_pci_tbl,129 .id_table = vx855_pci_tbl,
130 .probe = vx855_probe,130 .probe = vx855_probe,
131 .remove = __devexit_p(vx855_remove),131 .remove = vx855_remove,
132};132};
133 133
134module_pci_driver(vx855_pci_driver);134module_pci_driver(vx855_pci_driver);
drivers/mfd/wl1273-core.c+2−2
@@ -182,7 +182,7 @@ static int wl1273_core_remove(struct i2c_client *client) · 181 unmodified lines
182 return 0;182 return 0;
183}183}
184 184
185static int __devinit wl1273_core_probe(struct i2c_client *client,185static int wl1273_core_probe(struct i2c_client *client,
186 const struct i2c_device_id *id)186 const struct i2c_device_id *id)
187{187{
188 struct wl1273_fm_platform_data *pdata = client->dev.platform_data;188 struct wl1273_fm_platform_data *pdata = client->dev.platform_data;
@@ -262,7 +262,7 @@ static struct i2c_driver wl1273_core_driver = { · 73 unmodified lines
262 },262 },
263 .probe = wl1273_core_probe,263 .probe = wl1273_core_probe,
264 .id_table = wl1273_driver_id_table,264 .id_table = wl1273_driver_id_table,
265 .remove = __devexit_p(wl1273_core_remove),265 .remove = wl1273_core_remove,
266};266};
267 267
268static int __init wl1273_core_init(void)268static int __init wl1273_core_init(void)
drivers/mfd/wm831x-spi.c+3−3
@@ -21,7 +21,7 @@ · 20 unmodified lines
21 21
22#include <linux/mfd/wm831x/core.h>22#include <linux/mfd/wm831x/core.h>
23 23
24static int __devinit wm831x_spi_probe(struct spi_device *spi)24static int wm831x_spi_probe(struct spi_device *spi)
25{25{
26 const struct spi_device_id *id = spi_get_device_id(spi);26 const struct spi_device_id *id = spi_get_device_id(spi);
27 struct wm831x *wm831x;27 struct wm831x *wm831x;
@@ -51,7 +51,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi) · 23 unmodified lines
51 return wm831x_device_init(wm831x, type, spi->irq);51 return wm831x_device_init(wm831x, type, spi->irq);
52}52}
53 53
54static int __devexit wm831x_spi_remove(struct spi_device *spi)54static int wm831x_spi_remove(struct spi_device *spi)
55{55{
56 struct wm831x *wm831x = dev_get_drvdata(&spi->dev);56 struct wm831x *wm831x = dev_get_drvdata(&spi->dev);
57 57
@@ -99,7 +99,7 @@ static struct spi_driver wm831x_spi_driver = { · 41 unmodified lines
99 },99 },
100 .id_table = wm831x_spi_ids,100 .id_table = wm831x_spi_ids,
101 .probe = wm831x_spi_probe,101 .probe = wm831x_spi_probe,
102 .remove = __devexit_p(wm831x_spi_remove),102 .remove = wm831x_spi_remove,
103 .shutdown = wm831x_spi_shutdown,103 .shutdown = wm831x_spi_shutdown,
104};104};
105 105
drivers/mfd/wm8994-core.c+8−8
@@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo) · 373 unmodified lines
374}374}
375#endif375#endif
376 376
377static const __devinitconst struct reg_default wm8994_revc_patch[] = {377static const struct reg_default wm8994_revc_patch[] = {
378 { 0x102, 0x3 },378 { 0x102, 0x3 },
379 { 0x56, 0x3 },379 { 0x56, 0x3 },
380 { 0x817, 0x0 },380 { 0x817, 0x0 },
381 { 0x102, 0x0 },381 { 0x102, 0x0 },
382};382};
383 383
384static const __devinitconst struct reg_default wm8958_reva_patch[] = {384static const struct reg_default wm8958_reva_patch[] = {
385 { 0x102, 0x3 },385 { 0x102, 0x3 },
386 { 0xcb, 0x81 },386 { 0xcb, 0x81 },
387 { 0x817, 0x0 },387 { 0x817, 0x0 },
388 { 0x102, 0x0 },388 { 0x102, 0x0 },
389};389};
390 390
391static const __devinitconst struct reg_default wm1811_reva_patch[] = {391static const struct reg_default wm1811_reva_patch[] = {
392 { 0x102, 0x3 },392 { 0x102, 0x3 },
393 { 0x56, 0xc07 },393 { 0x56, 0xc07 },
394 { 0x5d, 0x7e },394 { 0x5d, 0x7e },
@@ -399,7 +399,7 @@ static const __devinitconst struct reg_default wm1811_reva_patch[] = { · 4 unmodified lines
399/*399/*
400 * Instantiate the generic non-control parts of the device.400 * Instantiate the generic non-control parts of the device.
401 */401 */
402static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)402static int wm8994_device_init(struct wm8994 *wm8994, int irq)
403{403{
404 struct wm8994_pdata *pdata = wm8994->dev->platform_data;404 struct wm8994_pdata *pdata = wm8994->dev->platform_data;
405 struct regmap_config *regmap_config;405 struct regmap_config *regmap_config;
@@ -671,7 +671,7 @@ err: · 265 unmodified lines
671 return ret;671 return ret;
672}672}
673 673
674static __devexit void wm8994_device_exit(struct wm8994 *wm8994)674static void wm8994_device_exit(struct wm8994 *wm8994)
675{675{
676 pm_runtime_disable(wm8994->dev);676 pm_runtime_disable(wm8994->dev);
677 mfd_remove_devices(wm8994->dev);677 mfd_remove_devices(wm8994->dev);
@@ -689,7 +689,7 @@ static const struct of_device_id wm8994_of_match[] = { · 11 unmodified lines
689};689};
690MODULE_DEVICE_TABLE(of, wm8994_of_match);690MODULE_DEVICE_TABLE(of, wm8994_of_match);
691 691
692static __devinit int wm8994_i2c_probe(struct i2c_client *i2c,692static int wm8994_i2c_probe(struct i2c_client *i2c,
693 const struct i2c_device_id *id)693 const struct i2c_device_id *id)
694{694{
695 struct wm8994 *wm8994;695 struct wm8994 *wm8994;
@@ -715,7 +715,7 @@ static __devinit int wm8994_i2c_probe(struct i2c_client *i2c, · 19 unmodified lines
715 return wm8994_device_init(wm8994, i2c->irq);715 return wm8994_device_init(wm8994, i2c->irq);
716}716}
717 717
718static __devexit int wm8994_i2c_remove(struct i2c_client *i2c)718static int wm8994_i2c_remove(struct i2c_client *i2c)
719{719{
720 struct wm8994 *wm8994 = i2c_get_clientdata(i2c);720 struct wm8994 *wm8994 = i2c_get_clientdata(i2c);
721 721
@@ -744,7 +744,7 @@ static struct i2c_driver wm8994_i2c_driver = { · 22 unmodified lines
744 .of_match_table = wm8994_of_match,744 .of_match_table = wm8994_of_match,
745 },745 },
746 .probe = wm8994_i2c_probe,746 .probe = wm8994_i2c_probe,
747 .remove = __devexit_p(wm8994_i2c_remove),747 .remove = wm8994_i2c_remove,
748 .id_table = wm8994_i2c_id,748 .id_table = wm8994_i2c_id,
749};749};
750 750
drivers/mmc/host/atmel-mci.c+1−1
@@ -511,7 +511,7 @@ static const struct of_device_id atmci_dt_ids[] = { · 510 unmodified lines
511 511
512MODULE_DEVICE_TABLE(of, atmci_dt_ids);512MODULE_DEVICE_TABLE(of, atmci_dt_ids);
513 513
514static struct mci_platform_data __devinit*514static struct mci_platform_data*
515atmci_of_init(struct platform_device *pdev)515atmci_of_init(struct platform_device *pdev)
516{516{
517 struct device_node *np = pdev->dev.of_node;517 struct device_node *np = pdev->dev.of_node;
drivers/mmc/host/au1xmmc.c+2−2
@@ -943,7 +943,7 @@ static const struct mmc_host_ops au1xmmc_ops = { · 942 unmodified lines
943 .enable_sdio_irq = au1xmmc_enable_sdio_irq,943 .enable_sdio_irq = au1xmmc_enable_sdio_irq,
944};944};
945 945
946static int __devinit au1xmmc_probe(struct platform_device *pdev)946static int au1xmmc_probe(struct platform_device *pdev)
947{947{
948 struct mmc_host *mmc;948 struct mmc_host *mmc;
949 struct au1xmmc_host *host;949 struct au1xmmc_host *host;
@@ -1114,7 +1114,7 @@ out0: · 164 unmodified lines
1114 return ret;1114 return ret;
1115}1115}
1116 1116
1117static int __devexit au1xmmc_remove(struct platform_device *pdev)1117static int au1xmmc_remove(struct platform_device *pdev)
1118{1118{
1119 struct au1xmmc_host *host = platform_get_drvdata(pdev);1119 struct au1xmmc_host *host = platform_get_drvdata(pdev);
1120 1120
drivers/mmc/host/bfin_sdh.c+3−3
@@ -522,7 +522,7 @@ static void sdh_reset(void) · 521 unmodified lines
522 SSYNC();522 SSYNC();
523}523}
524 524
525static int __devinit sdh_probe(struct platform_device *pdev)525static int sdh_probe(struct platform_device *pdev)
526{526{
527 struct mmc_host *mmc;527 struct mmc_host *mmc;
528 struct sdh_host *host;528 struct sdh_host *host;
@@ -617,7 +617,7 @@ out1: · 88 unmodified lines
617 return ret;617 return ret;
618}618}
619 619
620static int __devexit sdh_remove(struct platform_device *pdev)620static int sdh_remove(struct platform_device *pdev)
621{621{
622 struct mmc_host *mmc = platform_get_drvdata(pdev);622 struct mmc_host *mmc = platform_get_drvdata(pdev);
623 623
@@ -680,7 +680,7 @@ static int sdh_resume(struct platform_device *dev) · 56 unmodified lines
680 680
681static struct platform_driver sdh_driver = {681static struct platform_driver sdh_driver = {
682 .probe = sdh_probe,682 .probe = sdh_probe,
683 .remove = __devexit_p(sdh_remove),683 .remove = sdh_remove,
684 .suspend = sdh_suspend,684 .suspend = sdh_suspend,
685 .resume = sdh_resume,685 .resume = sdh_resume,
686 .driver = {686 .driver = {
drivers/mmc/host/cb710-mmc.c+3−3
@@ -690,7 +690,7 @@ static int cb710_mmc_resume(struct platform_device *pdev) · 689 unmodified lines
690 690
691#endif /* CONFIG_PM */691#endif /* CONFIG_PM */
692 692
693static int __devinit cb710_mmc_init(struct platform_device *pdev)693static int cb710_mmc_init(struct platform_device *pdev)
694{694{
695 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);695 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
696 struct cb710_chip *chip = cb710_slot_to_chip(slot);696 struct cb710_chip *chip = cb710_slot_to_chip(slot);
@@ -746,7 +746,7 @@ err_free_mmc: · 49 unmodified lines
746 return err;746 return err;
747}747}
748 748
749static int __devexit cb710_mmc_exit(struct platform_device *pdev)749static int cb710_mmc_exit(struct platform_device *pdev)
750{750{
751 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);751 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
752 struct mmc_host *mmc = cb710_slot_to_mmc(slot);752 struct mmc_host *mmc = cb710_slot_to_mmc(slot);
@@ -773,7 +773,7 @@ static int __devexit cb710_mmc_exit(struct platform_device *pdev) · 20 unmodified lines
773static struct platform_driver cb710_mmc_driver = {773static struct platform_driver cb710_mmc_driver = {
774 .driver.name = "cb710-mmc",774 .driver.name = "cb710-mmc",
775 .probe = cb710_mmc_init,775 .probe = cb710_mmc_init,
776 .remove = __devexit_p(cb710_mmc_exit),776 .remove = cb710_mmc_exit,
777#ifdef CONFIG_PM777#ifdef CONFIG_PM
778 .suspend = cb710_mmc_suspend,778 .suspend = cb710_mmc_suspend,
779 .resume = cb710_mmc_resume,779 .resume = cb710_mmc_resume,
drivers/mmc/host/dw_mmc-pci.c+2−2
@@ -37,7 +37,7 @@ static struct dw_mci_board pci_board_data = { · 36 unmodified lines
37 .fifo_depth = 32,37 .fifo_depth = 32,
38};38};
39 39
40static int __devinit dw_mci_pci_probe(struct pci_dev *pdev,40static int dw_mci_pci_probe(struct pci_dev *pdev,
41 const struct pci_device_id *entries)41 const struct pci_device_id *entries)
42{42{
43 struct dw_mci *host;43 struct dw_mci *host;
@@ -85,7 +85,7 @@ err_disable_dev: · 41 unmodified lines
85 return ret;85 return ret;
86}86}
87 87
88static void __devexit dw_mci_pci_remove(struct pci_dev *pdev)88static void dw_mci_pci_remove(struct pci_dev *pdev)
89{89{
90 struct dw_mci *host = pci_get_drvdata(pdev);90 struct dw_mci *host = pci_get_drvdata(pdev);
91 91
drivers/mmc/host/dw_mmc-pltfm.c+2−2
@@ -62,12 +62,12 @@ int dw_mci_pltfm_register(struct platform_device *pdev, · 61 unmodified lines
62}62}
63EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);63EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);
64 64
65static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)65static int dw_mci_pltfm_probe(struct platform_device *pdev)
66{66{
67 return dw_mci_pltfm_register(pdev, NULL);67 return dw_mci_pltfm_register(pdev, NULL);
68}68}
69 69
70static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev)70static int dw_mci_pltfm_remove(struct platform_device *pdev)
71{71{
72 struct dw_mci *host = platform_get_drvdata(pdev);72 struct dw_mci *host = platform_get_drvdata(pdev);
73 73
drivers/mmc/host/dw_mmc-pltfm.h+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
14 14
15extern int dw_mci_pltfm_register(struct platform_device *pdev,15extern int dw_mci_pltfm_register(struct platform_device *pdev,
16 const struct dw_mci_drv_data *drv_data);16 const struct dw_mci_drv_data *drv_data);
17extern int __devexit dw_mci_pltfm_remove(struct platform_device *pdev);17extern int dw_mci_pltfm_remove(struct platform_device *pdev);
18extern const struct dev_pm_ops dw_mci_pltfm_pmops;18extern const struct dev_pm_ops dw_mci_pltfm_pmops;
19 19
20#endif /* _DW_MMC_PLTFM_H_ */20#endif /* _DW_MMC_PLTFM_H_ */
drivers/mmc/host/jz4740_mmc.c+6−6
@@ -702,7 +702,7 @@ static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = { · 701 unmodified lines
702 JZ_GPIO_BULK_PIN(MSC_DATA3),702 JZ_GPIO_BULK_PIN(MSC_DATA3),
703};703};
704 704
705static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,705static int jz4740_mmc_request_gpio(struct device *dev, int gpio,
706 const char *name, bool output, int value)706 const char *name, bool output, int value)
707{707{
708 int ret;708 int ret;
@@ -724,7 +724,7 @@ static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio, · 15 unmodified lines
724 return 0;724 return 0;
725}725}
726 726
727static int __devinit jz4740_mmc_request_gpios(struct platform_device *pdev)727static int jz4740_mmc_request_gpios(struct platform_device *pdev)
728{728{
729 int ret;729 int ret;
730 struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;730 struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@ -759,7 +759,7 @@ err: · 28 unmodified lines
759 return ret;759 return ret;
760}760}
761 761
762static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev,762static int jz4740_mmc_request_cd_irq(struct platform_device *pdev,
763 struct jz4740_mmc_host *host)763 struct jz4740_mmc_host *host)
764{764{
765 struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;765 struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@ -802,7 +802,7 @@ static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host) · 36 unmodified lines
802 return num_pins;802 return num_pins;
803}803}
804 804
805static int __devinit jz4740_mmc_probe(struct platform_device* pdev)805static int jz4740_mmc_probe(struct platform_device* pdev)
806{806{
807 int ret;807 int ret;
808 struct mmc_host *mmc;808 struct mmc_host *mmc;
@@ -938,7 +938,7 @@ err_free_host: · 129 unmodified lines
938 return ret;938 return ret;
939}939}
940 940
941static int __devexit jz4740_mmc_remove(struct platform_device *pdev)941static int jz4740_mmc_remove(struct platform_device *pdev)
942{942{
943 struct jz4740_mmc_host *host = platform_get_drvdata(pdev);943 struct jz4740_mmc_host *host = platform_get_drvdata(pdev);
944 944
@@ -1004,7 +1004,7 @@ const struct dev_pm_ops jz4740_mmc_pm_ops = { · 59 unmodified lines
1004 1004
1005static struct platform_driver jz4740_mmc_driver = {1005static struct platform_driver jz4740_mmc_driver = {
1006 .probe = jz4740_mmc_probe,1006 .probe = jz4740_mmc_probe,
1007 .remove = __devexit_p(jz4740_mmc_remove),1007 .remove = jz4740_mmc_remove,
1008 .driver = {1008 .driver = {
1009 .name = "jz4740-mmc",1009 .name = "jz4740-mmc",
1010 .owner = THIS_MODULE,1010 .owner = THIS_MODULE,
drivers/mmc/host/mmc_spi.c+3−3
@@ -1485,7 +1485,7 @@ nomem: · 1484 unmodified lines
1485}1485}
1486 1486
1487 1487
1488static int __devexit mmc_spi_remove(struct spi_device *spi)1488static int mmc_spi_remove(struct spi_device *spi)
1489{1489{
1490 struct mmc_host *mmc = dev_get_drvdata(&spi->dev);1490 struct mmc_host *mmc = dev_get_drvdata(&spi->dev);
1491 struct mmc_spi_host *host;1491 struct mmc_spi_host *host;
@@ -1517,7 +1517,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi) · 25 unmodified lines
1517 return 0;1517 return 0;
1518}1518}
1519 1519
1520static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {1520static struct of_device_id mmc_spi_of_match_table[] = {
1521 { .compatible = "mmc-spi-slot", },1521 { .compatible = "mmc-spi-slot", },
1522 {},1522 {},
1523};1523};
@@ -1529,7 +1529,7 @@ static struct spi_driver mmc_spi_driver = { · 5 unmodified lines
1529 .of_match_table = mmc_spi_of_match_table,1529 .of_match_table = mmc_spi_of_match_table,
1530 },1530 },
1531 .probe = mmc_spi_probe,1531 .probe = mmc_spi_probe,
1532 .remove = __devexit_p(mmc_spi_remove),1532 .remove = mmc_spi_remove,
1533};1533};
1534 1534
1535module_spi_driver(mmc_spi_driver);1535module_spi_driver(mmc_spi_driver);
drivers/mmc/host/mmci.c+5−5
@@ -261,7 +261,7 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data) · 260 unmodified lines
261 * no custom DMA interfaces are supported.261 * no custom DMA interfaces are supported.
262 */262 */
263#ifdef CONFIG_DMA_ENGINE263#ifdef CONFIG_DMA_ENGINE
264static void __devinit mmci_dma_setup(struct mmci_host *host)264static void mmci_dma_setup(struct mmci_host *host)
265{265{
266 struct mmci_platform_data *plat = host->plat;266 struct mmci_platform_data *plat = host->plat;
267 const char *rxname, *txname;267 const char *rxname, *txname;
@@ -337,7 +337,7 @@ static void __devinit mmci_dma_setup(struct mmci_host *host) · 69 unmodified lines
337}337}
338 338
339/*339/*
340 * This is used in __devinit or __devexit so inline it340 * This is used in or so inline it
341 * so it can be discarded.341 * so it can be discarded.
342 */342 */
343static inline void mmci_dma_release(struct mmci_host *host)343static inline void mmci_dma_release(struct mmci_host *host)
@@ -1255,7 +1255,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, · 911 unmodified lines
1255}1255}
1256#endif1256#endif
1257 1257
1258static int __devinit mmci_probe(struct amba_device *dev,1258static int mmci_probe(struct amba_device *dev,
1259 const struct amba_id *id)1259 const struct amba_id *id)
1260{1260{
1261 struct mmci_platform_data *plat = dev->dev.platform_data;1261 struct mmci_platform_data *plat = dev->dev.platform_data;
@@ -1522,7 +1522,7 @@ static int __devinit mmci_probe(struct amba_device *dev, · 260 unmodified lines
1522 return ret;1522 return ret;
1523}1523}
1524 1524
1525static int __devexit mmci_remove(struct amba_device *dev)1525static int mmci_remove(struct amba_device *dev)
1526{1526{
1527 struct mmc_host *mmc = amba_get_drvdata(dev);1527 struct mmc_host *mmc = amba_get_drvdata(dev);
1528 1528
@@ -1669,7 +1669,7 @@ static struct amba_driver mmci_driver = { · 140 unmodified lines
1669 .pm = &mmci_dev_pm_ops,1669 .pm = &mmci_dev_pm_ops,
1670 },1670 },
1671 .probe = mmci_probe,1671 .probe = mmci_probe,
1672 .remove = __devexit_p(mmci_remove),1672 .remove = mmci_remove,
1673 .id_table = mmci_ids,1673 .id_table = mmci_ids,
1674};1674};
1675 1675
drivers/mmc/host/omap.c+4−4
@@ -1214,7 +1214,7 @@ static const struct mmc_host_ops mmc_omap_ops = { · 1213 unmodified lines
1214 .set_ios = mmc_omap_set_ios,1214 .set_ios = mmc_omap_set_ios,
1215};1215};
1216 1216
1217static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id)1217static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
1218{1218{
1219 struct mmc_omap_slot *slot = NULL;1219 struct mmc_omap_slot *slot = NULL;
1220 struct mmc_host *mmc;1220 struct mmc_host *mmc;
@@ -1309,7 +1309,7 @@ static void mmc_omap_remove_slot(struct mmc_omap_slot *slot) · 88 unmodified lines
1309 mmc_free_host(mmc);1309 mmc_free_host(mmc);
1310}1310}
1311 1311
1312static int __devinit mmc_omap_probe(struct platform_device *pdev)1312static int mmc_omap_probe(struct platform_device *pdev)
1313{1313{
1314 struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;1314 struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
1315 struct mmc_omap_host *host = NULL;1315 struct mmc_omap_host *host = NULL;
@@ -1478,7 +1478,7 @@ err_free_mem_region: · 162 unmodified lines
1478 return ret;1478 return ret;
1479}1479}
1480 1480
1481static int __devexit mmc_omap_remove(struct platform_device *pdev)1481static int mmc_omap_remove(struct platform_device *pdev)
1482{1482{
1483 struct mmc_omap_host *host = platform_get_drvdata(pdev);1483 struct mmc_omap_host *host = platform_get_drvdata(pdev);
1484 int i;1484 int i;
@@ -1566,7 +1566,7 @@ static int mmc_omap_resume(struct platform_device *pdev) · 81 unmodified lines
1566 1566
1567static struct platform_driver mmc_omap_driver = {1567static struct platform_driver mmc_omap_driver = {
1568 .probe = mmc_omap_probe,1568 .probe = mmc_omap_probe,
1569 .remove = __devexit_p(mmc_omap_remove),1569 .remove = mmc_omap_remove,
1570 .suspend = mmc_omap_suspend,1570 .suspend = mmc_omap_suspend,
1571 .resume = mmc_omap_resume,1571 .resume = mmc_omap_resume,
1572 .driver = {1572 .driver = {
drivers/mmc/host/omap_hsmmc.c+3−3
@@ -1761,7 +1761,7 @@ static inline struct omap_mmc_platform_data · 1760 unmodified lines
1761}1761}
1762#endif1762#endif
1763 1763
1764static int __devinit omap_hsmmc_probe(struct platform_device *pdev)1764static int omap_hsmmc_probe(struct platform_device *pdev)
1765{1765{
1766 struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;1766 struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
1767 struct mmc_host *mmc;1767 struct mmc_host *mmc;
@@ -2037,7 +2037,7 @@ err: · 269 unmodified lines
2037 return ret;2037 return ret;
2038}2038}
2039 2039
2040static int __devexit omap_hsmmc_remove(struct platform_device *pdev)2040static int omap_hsmmc_remove(struct platform_device *pdev)
2041{2041{
2042 struct omap_hsmmc_host *host = platform_get_drvdata(pdev);2042 struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
2043 struct resource *res;2043 struct resource *res;
@@ -2204,7 +2204,7 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = { · 160 unmodified lines
2204 2204
2205static struct platform_driver omap_hsmmc_driver = {2205static struct platform_driver omap_hsmmc_driver = {
2206 .probe = omap_hsmmc_probe,2206 .probe = omap_hsmmc_probe,
2207 .remove = __devexit_p(omap_hsmmc_remove),2207 .remove = omap_hsmmc_remove,
2208 .driver = {2208 .driver = {
2209 .name = DRIVER_NAME,2209 .name = DRIVER_NAME,
2210 .owner = THIS_MODULE,2210 .owner = THIS_MODULE,
drivers/mmc/host/pxamci.c+2−2
@@ -584,7 +584,7 @@ static const struct of_device_id pxa_mmc_dt_ids[] = { · 583 unmodified lines
584 584
585MODULE_DEVICE_TABLE(of, pxa_mmc_dt_ids);585MODULE_DEVICE_TABLE(of, pxa_mmc_dt_ids);
586 586
587static int __devinit pxamci_of_init(struct platform_device *pdev)587static int pxamci_of_init(struct platform_device *pdev)
588{588{
589 struct device_node *np = pdev->dev.of_node;589 struct device_node *np = pdev->dev.of_node;
590 struct pxamci_platform_data *pdata;590 struct pxamci_platform_data *pdata;
@@ -614,7 +614,7 @@ static int __devinit pxamci_of_init(struct platform_device *pdev) · 23 unmodified lines
614 return 0;614 return 0;
615}615}
616#else616#else
617static int __devinit pxamci_of_init(struct platform_device *pdev)617static int pxamci_of_init(struct platform_device *pdev)
618{618{
619 return 0;619 return 0;
620}620}
drivers/mmc/host/s3cmci.c+3−3
@@ -1540,7 +1540,7 @@ static inline void s3cmci_debugfs_remove(struct s3cmci_host *host) { } · 1539 unmodified lines
1540 1540
1541#endif /* CONFIG_DEBUG_FS */1541#endif /* CONFIG_DEBUG_FS */
1542 1542
1543static int __devinit s3cmci_probe(struct platform_device *pdev)1543static int s3cmci_probe(struct platform_device *pdev)
1544{1544{
1545 struct s3cmci_host *host;1545 struct s3cmci_host *host;
1546 struct mmc_host *mmc;1546 struct mmc_host *mmc;
@@ -1819,7 +1819,7 @@ static void s3cmci_shutdown(struct platform_device *pdev) · 272 unmodified lines
1819 clk_disable(host->clk);1819 clk_disable(host->clk);
1820}1820}
1821 1821
1822static int __devexit s3cmci_remove(struct platform_device *pdev)1822static int s3cmci_remove(struct platform_device *pdev)
1823{1823{
1824 struct mmc_host *mmc = platform_get_drvdata(pdev);1824 struct mmc_host *mmc = platform_get_drvdata(pdev);
1825 struct s3cmci_host *host = mmc_priv(mmc);1825 struct s3cmci_host *host = mmc_priv(mmc);
@@ -1906,7 +1906,7 @@ static struct platform_driver s3cmci_driver = { · 80 unmodified lines
1906 },1906 },
1907 .id_table = s3cmci_driver_ids,1907 .id_table = s3cmci_driver_ids,
1908 .probe = s3cmci_probe,1908 .probe = s3cmci_probe,
1909 .remove = __devexit_p(s3cmci_remove),1909 .remove = s3cmci_remove,
1910 .shutdown = s3cmci_shutdown,1910 .shutdown = s3cmci_shutdown,
1911};1911};
1912 1912
drivers/mmc/host/sdhci-cns3xxx.c+3−3
@@ -95,12 +95,12 @@ static struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { · 94 unmodified lines
95 SDHCI_QUIRK_NONSTANDARD_CLOCK,95 SDHCI_QUIRK_NONSTANDARD_CLOCK,
96};96};
97 97
98static int __devinit sdhci_cns3xxx_probe(struct platform_device *pdev)98static int sdhci_cns3xxx_probe(struct platform_device *pdev)
99{99{
100 return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata);100 return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata);
101}101}
102 102
103static int __devexit sdhci_cns3xxx_remove(struct platform_device *pdev)103static int sdhci_cns3xxx_remove(struct platform_device *pdev)
104{104{
105 return sdhci_pltfm_unregister(pdev);105 return sdhci_pltfm_unregister(pdev);
106}106}
@@ -112,7 +112,7 @@ static struct platform_driver sdhci_cns3xxx_driver = { · 5 unmodified lines
112 .pm = SDHCI_PLTFM_PMOPS,112 .pm = SDHCI_PLTFM_PMOPS,
113 },113 },
114 .probe = sdhci_cns3xxx_probe,114 .probe = sdhci_cns3xxx_probe,
115 .remove = __devexit_p(sdhci_cns3xxx_remove),115 .remove = sdhci_cns3xxx_remove,
116};116};
117 117
118module_platform_driver(sdhci_cns3xxx_driver);118module_platform_driver(sdhci_cns3xxx_driver);
drivers/mmc/host/sdhci-dove.c+4−4
@@ -97,7 +97,7 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = { · 96 unmodified lines
97 SDHCI_QUIRK_NO_HISPD_BIT,97 SDHCI_QUIRK_NO_HISPD_BIT,
98};98};
99 99
100static int __devinit sdhci_dove_probe(struct platform_device *pdev)100static int sdhci_dove_probe(struct platform_device *pdev)
101{101{
102 struct sdhci_host *host;102 struct sdhci_host *host;
103 struct sdhci_pltfm_host *pltfm_host;103 struct sdhci_pltfm_host *pltfm_host;
@@ -178,7 +178,7 @@ err_sdhci_pltfm_init: · 74 unmodified lines
178 return ret;178 return ret;
179}179}
180 180
181static int __devexit sdhci_dove_remove(struct platform_device *pdev)181static int sdhci_dove_remove(struct platform_device *pdev)
182{182{
183 struct sdhci_host *host = platform_get_drvdata(pdev);183 struct sdhci_host *host = platform_get_drvdata(pdev);
184 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);184 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -197,7 +197,7 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev) · 12 unmodified lines
197 return 0;197 return 0;
198}198}
199 199
200static const struct of_device_id sdhci_dove_of_match_table[] __devinitdata = {200static const struct of_device_id sdhci_dove_of_match_table[] = {
201 { .compatible = "marvell,dove-sdhci", },201 { .compatible = "marvell,dove-sdhci", },
202 {}202 {}
203};203};
@@ -211,7 +211,7 @@ static struct platform_driver sdhci_dove_driver = { · 7 unmodified lines
211 .of_match_table = of_match_ptr(sdhci_dove_of_match_table),211 .of_match_table = of_match_ptr(sdhci_dove_of_match_table),
212 },212 },
213 .probe = sdhci_dove_probe,213 .probe = sdhci_dove_probe,
214 .remove = __devexit_p(sdhci_dove_remove),214 .remove = sdhci_dove_remove,
215};215};
216 216
217module_platform_driver(sdhci_dove_driver);217module_platform_driver(sdhci_dove_driver);
drivers/mmc/host/sdhci-esdhc-imx.c+4−4
@@ -403,7 +403,7 @@ static irqreturn_t cd_irq(int irq, void *data) · 402 unmodified lines
403};403};
404 404
405#ifdef CONFIG_OF405#ifdef CONFIG_OF
406static int __devinit406static int
407sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,407sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
408 struct esdhc_platform_data *boarddata)408 struct esdhc_platform_data *boarddata)
409{409{
@@ -440,7 +440,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, · 30 unmodified lines
440}440}
441#endif441#endif
442 442
443static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)443static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
444{444{
445 const struct of_device_id *of_id =445 const struct of_device_id *of_id =
446 of_match_device(imx_esdhc_dt_ids, &pdev->dev);446 of_match_device(imx_esdhc_dt_ids, &pdev->dev);
@@ -590,7 +590,7 @@ free_sdhci: · 143 unmodified lines
590 return err;590 return err;
591}591}
592 592
593static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev)593static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
594{594{
595 struct sdhci_host *host = platform_get_drvdata(pdev);595 struct sdhci_host *host = platform_get_drvdata(pdev);
596 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);596 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -617,7 +617,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = { · 20 unmodified lines
617 },617 },
618 .id_table = imx_esdhc_devtype,618 .id_table = imx_esdhc_devtype,
619 .probe = sdhci_esdhc_imx_probe,619 .probe = sdhci_esdhc_imx_probe,
620 .remove = __devexit_p(sdhci_esdhc_imx_remove),620 .remove = sdhci_esdhc_imx_remove,
621};621};
622 622
623module_platform_driver(sdhci_esdhc_imx_driver);623module_platform_driver(sdhci_esdhc_imx_driver);
drivers/mmc/host/sdhci-of-esdhc.c+3−3
@@ -260,12 +260,12 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { · 259 unmodified lines
260 .ops = &sdhci_esdhc_ops,260 .ops = &sdhci_esdhc_ops,
261};261};
262 262
263static int __devinit sdhci_esdhc_probe(struct platform_device *pdev)263static int sdhci_esdhc_probe(struct platform_device *pdev)
264{264{
265 return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);265 return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);
266}266}
267 267
268static int __devexit sdhci_esdhc_remove(struct platform_device *pdev)268static int sdhci_esdhc_remove(struct platform_device *pdev)
269{269{
270 return sdhci_pltfm_unregister(pdev);270 return sdhci_pltfm_unregister(pdev);
271}271}
@@ -286,7 +286,7 @@ static struct platform_driver sdhci_esdhc_driver = { · 14 unmodified lines
286 .pm = SDHCI_PLTFM_PMOPS,286 .pm = SDHCI_PLTFM_PMOPS,
287 },287 },
288 .probe = sdhci_esdhc_probe,288 .probe = sdhci_esdhc_probe,
289 .remove = __devexit_p(sdhci_esdhc_remove),289 .remove = sdhci_esdhc_remove,
290};290};
291 291
292module_platform_driver(sdhci_esdhc_driver);292module_platform_driver(sdhci_esdhc_driver);
drivers/mmc/host/sdhci-of-hlwd.c+3−3
@@ -66,12 +66,12 @@ static struct sdhci_pltfm_data sdhci_hlwd_pdata = { · 65 unmodified lines
66 .ops = &sdhci_hlwd_ops,66 .ops = &sdhci_hlwd_ops,
67};67};
68 68
69static int __devinit sdhci_hlwd_probe(struct platform_device *pdev)69static int sdhci_hlwd_probe(struct platform_device *pdev)
70{70{
71 return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata);71 return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata);
72}72}
73 73
74static int __devexit sdhci_hlwd_remove(struct platform_device *pdev)74static int sdhci_hlwd_remove(struct platform_device *pdev)
75{75{
76 return sdhci_pltfm_unregister(pdev);76 return sdhci_pltfm_unregister(pdev);
77}77}
@@ -90,7 +90,7 @@ static struct platform_driver sdhci_hlwd_driver = { · 12 unmodified lines
90 .pm = SDHCI_PLTFM_PMOPS,90 .pm = SDHCI_PLTFM_PMOPS,
91 },91 },
92 .probe = sdhci_hlwd_probe,92 .probe = sdhci_hlwd_probe,
93 .remove = __devexit_p(sdhci_hlwd_remove),93 .remove = sdhci_hlwd_remove,
94};94};
95 95
96module_platform_driver(sdhci_hlwd_driver);96module_platform_driver(sdhci_hlwd_driver);
drivers/mmc/host/sdhci-pci.c+7−7
@@ -654,7 +654,7 @@ static const struct sdhci_pci_fixes sdhci_via = { · 653 unmodified lines
654 .probe = via_probe,654 .probe = via_probe,
655};655};
656 656
657static const struct pci_device_id pci_ids[] __devinitconst = {657static const struct pci_device_id pci_ids[] = {
658 {658 {
659 .vendor = PCI_VENDOR_ID_RICOH,659 .vendor = PCI_VENDOR_ID_RICOH,
660 .device = PCI_DEVICE_ID_RICOH_R5C822,660 .device = PCI_DEVICE_ID_RICOH_R5C822,
@@ -1184,7 +1184,7 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = { · 523 unmodified lines
1184 * *1184 * *
1185\*****************************************************************************/1185\*****************************************************************************/
1186 1186
1187static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(1187static struct sdhci_pci_slot *sdhci_pci_probe_slot(
1188 struct pci_dev *pdev, struct sdhci_pci_chip *chip, int first_bar,1188 struct pci_dev *pdev, struct sdhci_pci_chip *chip, int first_bar,
1189 int slotno)1189 int slotno)
1190{1190{
@@ -1339,7 +1339,7 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot) · 148 unmodified lines
1339 sdhci_free_host(slot->host);1339 sdhci_free_host(slot->host);
1340}1340}
1341 1341
1342static void __devinit sdhci_pci_runtime_pm_allow(struct device *dev)1342static void sdhci_pci_runtime_pm_allow(struct device *dev)
1343{1343{
1344 pm_runtime_put_noidle(dev);1344 pm_runtime_put_noidle(dev);
1345 pm_runtime_allow(dev);1345 pm_runtime_allow(dev);
@@ -1348,13 +1348,13 @@ static void __devinit sdhci_pci_runtime_pm_allow(struct device *dev) · 2 unmodified lines
1348 pm_suspend_ignore_children(dev, 1);1348 pm_suspend_ignore_children(dev, 1);
1349}1349}
1350 1350
1351static void __devexit sdhci_pci_runtime_pm_forbid(struct device *dev)1351static void sdhci_pci_runtime_pm_forbid(struct device *dev)
1352{1352{
1353 pm_runtime_forbid(dev);1353 pm_runtime_forbid(dev);
1354 pm_runtime_get_noresume(dev);1354 pm_runtime_get_noresume(dev);
1355}1355}
1356 1356
1357static int __devinit sdhci_pci_probe(struct pci_dev *pdev,1357static int sdhci_pci_probe(struct pci_dev *pdev,
1358 const struct pci_device_id *ent)1358 const struct pci_device_id *ent)
1359{1359{
1360 struct sdhci_pci_chip *chip;1360 struct sdhci_pci_chip *chip;
@@ -1446,7 +1446,7 @@ err: · 85 unmodified lines
1446 return ret;1446 return ret;
1447}1447}
1448 1448
1449static void __devexit sdhci_pci_remove(struct pci_dev *pdev)1449static void sdhci_pci_remove(struct pci_dev *pdev)
1450{1450{
1451 int i;1451 int i;
1452 struct sdhci_pci_chip *chip;1452 struct sdhci_pci_chip *chip;
@@ -1471,7 +1471,7 @@ static struct pci_driver sdhci_driver = { · 18 unmodified lines
1471 .name = "sdhci-pci",1471 .name = "sdhci-pci",
1472 .id_table = pci_ids,1472 .id_table = pci_ids,
1473 .probe = sdhci_pci_probe,1473 .probe = sdhci_pci_probe,
1474 .remove = __devexit_p(sdhci_pci_remove),1474 .remove = sdhci_pci_remove,
1475 .driver = {1475 .driver = {
1476 .pm = &sdhci_pci_pm_ops1476 .pm = &sdhci_pci_pm_ops
1477 },1477 },
drivers/mmc/host/sdhci-pxav2.c+3−3
@@ -166,7 +166,7 @@ static inline struct sdhci_pxa_platdata *pxav2_get_mmc_pdata(struct device *dev) · 165 unmodified lines
166}166}
167#endif167#endif
168 168
169static int __devinit sdhci_pxav2_probe(struct platform_device *pdev)169static int sdhci_pxav2_probe(struct platform_device *pdev)
170{170{
171 struct sdhci_pltfm_host *pltfm_host;171 struct sdhci_pltfm_host *pltfm_host;
172 struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;172 struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
@@ -247,7 +247,7 @@ err_clk_get: · 74 unmodified lines
247 return ret;247 return ret;
248}248}
249 249
250static int __devexit sdhci_pxav2_remove(struct platform_device *pdev)250static int sdhci_pxav2_remove(struct platform_device *pdev)
251{251{
252 struct sdhci_host *host = platform_get_drvdata(pdev);252 struct sdhci_host *host = platform_get_drvdata(pdev);
253 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);253 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -275,7 +275,7 @@ static struct platform_driver sdhci_pxav2_driver = { · 21 unmodified lines
275 .pm = SDHCI_PLTFM_PMOPS,275 .pm = SDHCI_PLTFM_PMOPS,
276 },276 },
277 .probe = sdhci_pxav2_probe,277 .probe = sdhci_pxav2_probe,
278 .remove = __devexit_p(sdhci_pxav2_remove),278 .remove = sdhci_pxav2_remove,
279};279};
280 280
281module_platform_driver(sdhci_pxav2_driver);281module_platform_driver(sdhci_pxav2_driver);
drivers/mmc/host/sdhci-pxav3.c+3−3
@@ -222,7 +222,7 @@ static inline struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) · 221 unmodified lines
222}222}
223#endif223#endif
224 224
225static int __devinit sdhci_pxav3_probe(struct platform_device *pdev)225static int sdhci_pxav3_probe(struct platform_device *pdev)
226{226{
227 struct sdhci_pltfm_host *pltfm_host;227 struct sdhci_pltfm_host *pltfm_host;
228 struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;228 struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
@@ -324,7 +324,7 @@ err_clk_get: · 95 unmodified lines
324 return ret;324 return ret;
325}325}
326 326
327static int __devexit sdhci_pxav3_remove(struct platform_device *pdev)327static int sdhci_pxav3_remove(struct platform_device *pdev)
328{328{
329 struct sdhci_host *host = platform_get_drvdata(pdev);329 struct sdhci_host *host = platform_get_drvdata(pdev);
330 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);330 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -357,7 +357,7 @@ static struct platform_driver sdhci_pxav3_driver = { · 26 unmodified lines
357 .pm = SDHCI_PLTFM_PMOPS,357 .pm = SDHCI_PLTFM_PMOPS,
358 },358 },
359 .probe = sdhci_pxav3_probe,359 .probe = sdhci_pxav3_probe,
360 .remove = __devexit_p(sdhci_pxav3_remove),360 .remove = sdhci_pxav3_remove,
361};361};
362 362
363module_platform_driver(sdhci_pxav3_driver);363module_platform_driver(sdhci_pxav3_driver);
drivers/mmc/host/sdhci-s3c.c+5−5
@@ -441,7 +441,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc) · 440 unmodified lines
441}441}
442 442
443#ifdef CONFIG_OF443#ifdef CONFIG_OF
444static int __devinit sdhci_s3c_parse_dt(struct device *dev,444static int sdhci_s3c_parse_dt(struct device *dev,
445 struct sdhci_host *host, struct s3c_sdhci_platdata *pdata)445 struct sdhci_host *host, struct s3c_sdhci_platdata *pdata)
446{446{
447 struct device_node *node = dev->of_node;447 struct device_node *node = dev->of_node;
@@ -532,7 +532,7 @@ static int __devinit sdhci_s3c_parse_dt(struct device *dev, · 84 unmodified lines
532 return 0;532 return 0;
533}533}
534#else534#else
535static int __devinit sdhci_s3c_parse_dt(struct device *dev,535static int sdhci_s3c_parse_dt(struct device *dev,
536 struct sdhci_host *host, struct s3c_sdhci_platdata *pdata)536 struct sdhci_host *host, struct s3c_sdhci_platdata *pdata)
537{537{
538 return -EINVAL;538 return -EINVAL;
@@ -555,7 +555,7 @@ static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data( · 16 unmodified lines
555 platform_get_device_id(pdev)->driver_data;555 platform_get_device_id(pdev)->driver_data;
556}556}
557 557
558static int __devinit sdhci_s3c_probe(struct platform_device *pdev)558static int sdhci_s3c_probe(struct platform_device *pdev)
559{559{
560 struct s3c_sdhci_platdata *pdata;560 struct s3c_sdhci_platdata *pdata;
561 struct sdhci_s3c_drv_data *drv_data;561 struct sdhci_s3c_drv_data *drv_data;
@@ -781,7 +781,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · 219 unmodified lines
781 return ret;781 return ret;
782}782}
783 783
784static int __devexit sdhci_s3c_remove(struct platform_device *pdev)784static int sdhci_s3c_remove(struct platform_device *pdev)
785{785{
786 struct sdhci_host *host = platform_get_drvdata(pdev);786 struct sdhci_host *host = platform_get_drvdata(pdev);
787 struct sdhci_s3c *sc = sdhci_priv(host);787 struct sdhci_s3c *sc = sdhci_priv(host);
@@ -911,7 +911,7 @@ MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match); · 123 unmodified lines
911 911
912static struct platform_driver sdhci_s3c_driver = {912static struct platform_driver sdhci_s3c_driver = {
913 .probe = sdhci_s3c_probe,913 .probe = sdhci_s3c_probe,
914 .remove = __devexit_p(sdhci_s3c_remove),914 .remove = sdhci_s3c_remove,
915 .id_table = sdhci_s3c_driver_ids,915 .id_table = sdhci_s3c_driver_ids,
916 .driver = {916 .driver = {
917 .owner = THIS_MODULE,917 .owner = THIS_MODULE,
drivers/mmc/host/sdhci-spear.c+5−7
@@ -71,8 +71,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id) · 70 unmodified lines
71}71}
72 72
73#ifdef CONFIG_OF73#ifdef CONFIG_OF
74static struct sdhci_plat_data * __devinit74static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev)
75sdhci_probe_config_dt(struct platform_device *pdev)
76{75{
77 struct device_node *np = pdev->dev.of_node;76 struct device_node *np = pdev->dev.of_node;
78 struct sdhci_plat_data *pdata = NULL;77 struct sdhci_plat_data *pdata = NULL;
@@ -96,14 +95,13 @@ sdhci_probe_config_dt(struct platform_device *pdev) · 17 unmodified lines
96 return pdata;95 return pdata;
97}96}
98#else97#else
99static struct sdhci_plat_data * __devinit98static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev)
100sdhci_probe_config_dt(struct platform_device *pdev)
101{99{
102 return ERR_PTR(-ENOSYS);100 return ERR_PTR(-ENOSYS);
103}101}
104#endif102#endif
105 103
106static int __devinit sdhci_probe(struct platform_device *pdev)104static int sdhci_probe(struct platform_device *pdev)
107{105{
108 struct device_node *np = pdev->dev.of_node;106 struct device_node *np = pdev->dev.of_node;
109 struct sdhci_host *host;107 struct sdhci_host *host;
@@ -273,7 +271,7 @@ err: · 163 unmodified lines
273 return ret;271 return ret;
274}272}
275 273
276static int __devexit sdhci_remove(struct platform_device *pdev)274static int sdhci_remove(struct platform_device *pdev)
277{275{
278 struct sdhci_host *host = platform_get_drvdata(pdev);276 struct sdhci_host *host = platform_get_drvdata(pdev);
279 struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);277 struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
@@ -341,7 +339,7 @@ static struct platform_driver sdhci_driver = { · 61 unmodified lines
341 .of_match_table = of_match_ptr(sdhci_spear_id_table),339 .of_match_table = of_match_ptr(sdhci_spear_id_table),
342 },340 },
343 .probe = sdhci_probe,341 .probe = sdhci_probe,
344 .remove = __devexit_p(sdhci_remove),342 .remove = sdhci_remove,
345};343};
346 344
347module_platform_driver(sdhci_driver);345module_platform_driver(sdhci_driver);
drivers/mmc/host/sdhci-tegra.c+5−5
@@ -206,7 +206,7 @@ static struct sdhci_tegra_soc_data soc_data_tegra30 = { · 205 unmodified lines
206};206};
207#endif207#endif
208 208
209static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = {209static const struct of_device_id sdhci_tegra_dt_match[] = {
210#ifdef CONFIG_ARCH_TEGRA_3x_SOC210#ifdef CONFIG_ARCH_TEGRA_3x_SOC
211 { .compatible = "nvidia,tegra30-sdhci", .data = &soc_data_tegra30 },211 { .compatible = "nvidia,tegra30-sdhci", .data = &soc_data_tegra30 },
212#endif212#endif
@@ -217,7 +217,7 @@ static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = { · 4 unmodified lines
217};217};
218MODULE_DEVICE_TABLE(of, sdhci_dt_ids);218MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
219 219
220static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(220static struct tegra_sdhci_platform_data *sdhci_tegra_dt_parse_pdata(
221 struct platform_device *pdev)221 struct platform_device *pdev)
222{222{
223 struct tegra_sdhci_platform_data *plat;223 struct tegra_sdhci_platform_data *plat;
@@ -244,7 +244,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata( · 20 unmodified lines
244 return plat;244 return plat;
245}245}
246 246
247static int __devinit sdhci_tegra_probe(struct platform_device *pdev)247static int sdhci_tegra_probe(struct platform_device *pdev)
248{248{
249 const struct of_device_id *match;249 const struct of_device_id *match;
250 const struct sdhci_tegra_soc_data *soc_data;250 const struct sdhci_tegra_soc_data *soc_data;
@@ -370,7 +370,7 @@ err_no_plat: · 119 unmodified lines
370 return rc;370 return rc;
371}371}
372 372
373static int __devexit sdhci_tegra_remove(struct platform_device *pdev)373static int sdhci_tegra_remove(struct platform_device *pdev)
374{374{
375 struct sdhci_host *host = platform_get_drvdata(pdev);375 struct sdhci_host *host = platform_get_drvdata(pdev);
376 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);376 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -407,7 +407,7 @@ static struct platform_driver sdhci_tegra_driver = { · 30 unmodified lines
407 .pm = SDHCI_PLTFM_PMOPS,407 .pm = SDHCI_PLTFM_PMOPS,
408 },408 },
409 .probe = sdhci_tegra_probe,409 .probe = sdhci_tegra_probe,
410 .remove = __devexit_p(sdhci_tegra_remove),410 .remove = sdhci_tegra_remove,
411};411};
412 412
413module_platform_driver(sdhci_tegra_driver);413module_platform_driver(sdhci_tegra_driver);
drivers/mmc/host/sh_mmcif.c+2−2
@@ -1298,7 +1298,7 @@ static void sh_mmcif_init_ocr(struct sh_mmcif_host *host) · 1297 unmodified lines
1298 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");1298 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");
1299}1299}
1300 1300
1301static int __devinit sh_mmcif_probe(struct platform_device *pdev)1301static int sh_mmcif_probe(struct platform_device *pdev)
1302{1302{
1303 int ret = 0, irq[2];1303 int ret = 0, irq[2];
1304 struct mmc_host *mmc;1304 struct mmc_host *mmc;
@@ -1424,7 +1424,7 @@ ealloch: · 119 unmodified lines
1424 return ret;1424 return ret;
1425}1425}
1426 1426
1427static int __devexit sh_mmcif_remove(struct platform_device *pdev)1427static int sh_mmcif_remove(struct platform_device *pdev)
1428{1428{
1429 struct sh_mmcif_host *host = platform_get_drvdata(pdev);1429 struct sh_mmcif_host *host = platform_get_drvdata(pdev);
1430 struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;1430 struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
drivers/mmc/host/sh_mobile_sdhi.c+2−2
@@ -117,7 +117,7 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = { · 116 unmodified lines
117 .cd_wakeup = sh_mobile_sdhi_cd_wakeup,117 .cd_wakeup = sh_mobile_sdhi_cd_wakeup,
118};118};
119 119
120static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)120static int sh_mobile_sdhi_probe(struct platform_device *pdev)
121{121{
122 struct sh_mobile_sdhi *priv;122 struct sh_mobile_sdhi *priv;
123 struct tmio_mmc_data *mmc_data;123 struct tmio_mmc_data *mmc_data;
@@ -328,7 +328,7 @@ static struct platform_driver sh_mobile_sdhi_driver = { · 204 unmodified lines
328 .of_match_table = sh_mobile_sdhi_of_match,328 .of_match_table = sh_mobile_sdhi_of_match,
329 },329 },
330 .probe = sh_mobile_sdhi_probe,330 .probe = sh_mobile_sdhi_probe,
331 .remove = __devexit_p(sh_mobile_sdhi_remove),331 .remove = sh_mobile_sdhi_remove,
332};332};
333 333
334module_platform_driver(sh_mobile_sdhi_driver);334module_platform_driver(sh_mobile_sdhi_driver);
drivers/mmc/host/tmio_mmc.c+3−3
@@ -57,7 +57,7 @@ static int tmio_mmc_resume(struct platform_device *dev) · 56 unmodified lines
57#define tmio_mmc_resume NULL57#define tmio_mmc_resume NULL
58#endif58#endif
59 59
60static int __devinit tmio_mmc_probe(struct platform_device *pdev)60static int tmio_mmc_probe(struct platform_device *pdev)
61{61{
62 const struct mfd_cell *cell = mfd_get_cell(pdev);62 const struct mfd_cell *cell = mfd_get_cell(pdev);
63 struct tmio_mmc_data *pdata;63 struct tmio_mmc_data *pdata;
@@ -107,7 +107,7 @@ out: · 43 unmodified lines
107 return ret;107 return ret;
108}108}
109 109
110static int __devexit tmio_mmc_remove(struct platform_device *pdev)110static int tmio_mmc_remove(struct platform_device *pdev)
111{111{
112 const struct mfd_cell *cell = mfd_get_cell(pdev);112 const struct mfd_cell *cell = mfd_get_cell(pdev);
113 struct mmc_host *mmc = platform_get_drvdata(pdev);113 struct mmc_host *mmc = platform_get_drvdata(pdev);
@@ -133,7 +133,7 @@ static struct platform_driver tmio_mmc_driver = { · 19 unmodified lines
133 .owner = THIS_MODULE,133 .owner = THIS_MODULE,
134 },134 },
135 .probe = tmio_mmc_probe,135 .probe = tmio_mmc_probe,
136 .remove = __devexit_p(tmio_mmc_remove),136 .remove = tmio_mmc_remove,
137 .suspend = tmio_mmc_suspend,137 .suspend = tmio_mmc_suspend,
138 .resume = tmio_mmc_resume,138 .resume = tmio_mmc_resume,
139};139};
drivers/mmc/host/tmio_mmc_pio.c+1−1
@@ -918,7 +918,7 @@ static void tmio_mmc_init_ocr(struct tmio_mmc_host *host) · 917 unmodified lines
918 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");918 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");
919}919}
920 920
921int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host,921int tmio_mmc_host_probe(struct tmio_mmc_host **host,
922 struct platform_device *pdev,922 struct platform_device *pdev,
923 struct tmio_mmc_data *pdata)923 struct tmio_mmc_data *pdata)
924{924{
drivers/mmc/host/via-sdmmc.c+3−3
@@ -1082,7 +1082,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host) · 1081 unmodified lines
1082 msleep(1);1082 msleep(1);
1083}1083}
1084 1084
1085static int __devinit via_sd_probe(struct pci_dev *pcidev,1085static int via_sd_probe(struct pci_dev *pcidev,
1086 const struct pci_device_id *id)1086 const struct pci_device_id *id)
1087{1087{
1088 struct mmc_host *mmc;1088 struct mmc_host *mmc;
@@ -1176,7 +1176,7 @@ disable: · 87 unmodified lines
1176 return ret;1176 return ret;
1177}1177}
1178 1178
1179static void __devexit via_sd_remove(struct pci_dev *pcidev)1179static void via_sd_remove(struct pci_dev *pcidev)
1180{1180{
1181 struct via_crdr_mmc_host *sdhost = pci_get_drvdata(pcidev);1181 struct via_crdr_mmc_host *sdhost = pci_get_drvdata(pcidev);
1182 unsigned long flags;1182 unsigned long flags;
@@ -1332,7 +1332,7 @@ static struct pci_driver via_sd_driver = { · 149 unmodified lines
1332 .name = DRV_NAME,1332 .name = DRV_NAME,
1333 .id_table = via_ids,1333 .id_table = via_ids,
1334 .probe = via_sd_probe,1334 .probe = via_sd_probe,
1335 .remove = __devexit_p(via_sd_remove),1335 .remove = via_sd_remove,
1336 .suspend = via_sd_suspend,1336 .suspend = via_sd_suspend,
1337 .resume = via_sd_resume,1337 .resume = via_sd_resume,
1338};1338};
drivers/mmc/host/wbsd.c+14−14
@@ -1196,7 +1196,7 @@ static irqreturn_t wbsd_irq(int irq, void *dev_id) · 1195 unmodified lines
1196 * Allocate/free MMC structure.1196 * Allocate/free MMC structure.
1197 */1197 */
1198 1198
1199static int __devinit wbsd_alloc_mmc(struct device *dev)1199static int wbsd_alloc_mmc(struct device *dev)
1200{1200{
1201 struct mmc_host *mmc;1201 struct mmc_host *mmc;
1202 struct wbsd_host *host;1202 struct wbsd_host *host;
@@ -1288,7 +1288,7 @@ static void wbsd_free_mmc(struct device *dev) · 85 unmodified lines
1288 * Scan for known chip id:s1288 * Scan for known chip id:s
1289 */1289 */
1290 1290
1291static int __devinit wbsd_scan(struct wbsd_host *host)1291static int wbsd_scan(struct wbsd_host *host)
1292{1292{
1293 int i, j, k;1293 int i, j, k;
1294 int id;1294 int id;
@@ -1344,7 +1344,7 @@ static int __devinit wbsd_scan(struct wbsd_host *host) · 49 unmodified lines
1344 * Allocate/free io port ranges1344 * Allocate/free io port ranges
1345 */1345 */
1346 1346
1347static int __devinit wbsd_request_region(struct wbsd_host *host, int base)1347static int wbsd_request_region(struct wbsd_host *host, int base)
1348{1348{
1349 if (base & 0x7)1349 if (base & 0x7)
1350 return -EINVAL;1350 return -EINVAL;
@@ -1374,7 +1374,7 @@ static void wbsd_release_regions(struct wbsd_host *host) · 23 unmodified lines
1374 * Allocate/free DMA port and buffer1374 * Allocate/free DMA port and buffer
1375 */1375 */
1376 1376
1377static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma)1377static void wbsd_request_dma(struct wbsd_host *host, int dma)
1378{1378{
1379 if (dma < 0)1379 if (dma < 0)
1380 return;1380 return;
@@ -1452,7 +1452,7 @@ static void wbsd_release_dma(struct wbsd_host *host) · 71 unmodified lines
1452 * Allocate/free IRQ.1452 * Allocate/free IRQ.
1453 */1453 */
1454 1454
1455static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)1455static int wbsd_request_irq(struct wbsd_host *host, int irq)
1456{1456{
1457 int ret;1457 int ret;
1458 1458
@@ -1502,7 +1502,7 @@ static void wbsd_release_irq(struct wbsd_host *host) · 43 unmodified lines
1502 * Allocate all resources for the host.1502 * Allocate all resources for the host.
1503 */1503 */
1504 1504
1505static int __devinit wbsd_request_resources(struct wbsd_host *host,1505static int wbsd_request_resources(struct wbsd_host *host,
1506 int base, int irq, int dma)1506 int base, int irq, int dma)
1507{1507{
1508 int ret;1508 int ret;
@@ -1644,7 +1644,7 @@ static void wbsd_chip_poweroff(struct wbsd_host *host) · 135 unmodified lines
1644 * *1644 * *
1645\*****************************************************************************/1645\*****************************************************************************/
1646 1646
1647static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,1647static int wbsd_init(struct device *dev, int base, int irq, int dma,
1648 int pnp)1648 int pnp)
1649{1649{
1650 struct wbsd_host *host = NULL;1650 struct wbsd_host *host = NULL;
@@ -1735,7 +1735,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, · 84 unmodified lines
1735 return 0;1735 return 0;
1736}1736}
1737 1737
1738static void __devexit wbsd_shutdown(struct device *dev, int pnp)1738static void wbsd_shutdown(struct device *dev, int pnp)
1739{1739{
1740 struct mmc_host *mmc = dev_get_drvdata(dev);1740 struct mmc_host *mmc = dev_get_drvdata(dev);
1741 struct wbsd_host *host;1741 struct wbsd_host *host;
@@ -1762,13 +1762,13 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp) · 20 unmodified lines
1762 * Non-PnP1762 * Non-PnP
1763 */1763 */
1764 1764
1765static int __devinit wbsd_probe(struct platform_device *dev)1765static int wbsd_probe(struct platform_device *dev)
1766{1766{
1767 /* Use the module parameters for resources */1767 /* Use the module parameters for resources */
1768 return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0);1768 return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0);
1769}1769}
1770 1770
1771static int __devexit wbsd_remove(struct platform_device *dev)1771static int wbsd_remove(struct platform_device *dev)
1772{1772{
1773 wbsd_shutdown(&dev->dev, 0);1773 wbsd_shutdown(&dev->dev, 0);
1774 1774
@@ -1781,7 +1781,7 @@ static int __devexit wbsd_remove(struct platform_device *dev) · 6 unmodified lines
1781 1781
1782#ifdef CONFIG_PNP1782#ifdef CONFIG_PNP
1783 1783
1784static int __devinit1784static int
1785wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id)1785wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id)
1786{1786{
1787 int io, irq, dma;1787 int io, irq, dma;
@@ -1801,7 +1801,7 @@ wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id) · 13 unmodified lines
1801 return wbsd_init(&pnpdev->dev, io, irq, dma, 1);1801 return wbsd_init(&pnpdev->dev, io, irq, dma, 1);
1802}1802}
1803 1803
1804static void __devexit wbsd_pnp_remove(struct pnp_dev *dev)1804static void wbsd_pnp_remove(struct pnp_dev *dev)
1805{1805{
1806 wbsd_shutdown(&dev->dev, 1);1806 wbsd_shutdown(&dev->dev, 1);
1807}1807}
@@ -1941,7 +1941,7 @@ static struct platform_device *wbsd_device; · 133 unmodified lines
1941 1941
1942static struct platform_driver wbsd_driver = {1942static struct platform_driver wbsd_driver = {
1943 .probe = wbsd_probe,1943 .probe = wbsd_probe,
1944 .remove = __devexit_p(wbsd_remove),1944 .remove = wbsd_remove,
1945 1945
1946 .suspend = wbsd_platform_suspend,1946 .suspend = wbsd_platform_suspend,
1947 .resume = wbsd_platform_resume,1947 .resume = wbsd_platform_resume,
@@ -1957,7 +1957,7 @@ static struct pnp_driver wbsd_pnp_driver = { · 9 unmodified lines
1957 .name = DRIVER_NAME,1957 .name = DRIVER_NAME,
1958 .id_table = pnp_dev_table,1958 .id_table = pnp_dev_table,
1959 .probe = wbsd_pnp_probe,1959 .probe = wbsd_pnp_probe,
1960 .remove = __devexit_p(wbsd_pnp_remove),1960 .remove = wbsd_pnp_remove,
1961 1961
1962 .suspend = wbsd_pnp_suspend,1962 .suspend = wbsd_pnp_suspend,
1963 .resume = wbsd_pnp_resume,1963 .resume = wbsd_pnp_resume,
drivers/pci/Makefile+1−6
@@ -4,7 +4,7 @@ · 3 unmodified lines
4 4
5obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \5obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \
6 pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \6 pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
7 irq.o vpd.o7 irq.o vpd.o setup-bus.o
8obj-$(CONFIG_PROC_FS) += proc.o8obj-$(CONFIG_PROC_FS) += proc.o
9obj-$(CONFIG_SYSFS) += slot.o9obj-$(CONFIG_SYSFS) += slot.o
10 10
@@ -15,8 +15,6 @@ obj-$(CONFIG_PCIEPORTBUS) += pcie/ · 4 unmodified lines
15 15
16obj-$(CONFIG_PCI_IOAPIC) += ioapic.o16obj-$(CONFIG_PCI_IOAPIC) += ioapic.o
17 17
18obj-$(CONFIG_HOTPLUG) += hotplug.o
19
20# Build the PCI Hotplug drivers if we were asked to18# Build the PCI Hotplug drivers if we were asked to
21obj-$(CONFIG_HOTPLUG_PCI) += hotplug/19obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
22ifdef CONFIG_HOTPLUG_PCI20ifdef CONFIG_HOTPLUG_PCI
@@ -60,9 +58,6 @@ obj-$(CONFIG_ACPI) += pci-acpi.o · 37 unmodified lines
60# SMBIOS provided firmware instance and labels58# SMBIOS provided firmware instance and labels
61obj-$(CONFIG_PCI_LABEL) += pci-label.o59obj-$(CONFIG_PCI_LABEL) += pci-label.o
62 60
63# Cardbus & CompactPCI use setup-bus
64obj-$(CONFIG_HOTPLUG) += setup-bus.o
65
66obj-$(CONFIG_PCI_SYSCALL) += syscall.o61obj-$(CONFIG_PCI_SYSCALL) += syscall.o
67 62
68obj-$(CONFIG_PCI_STUB) += pci-stub.o63obj-$(CONFIG_PCI_STUB) += pci-stub.o
drivers/pci/hotplug.c+0−37
@@ -1,37 +0,0 @@
1#include <linux/kernel.h>
2#include <linux/pci.h>
3#include <linux/module.h>
4#include "pci.h"
5
6int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
7{
8 struct pci_dev *pdev;
9
10 if (!dev)
11 return -ENODEV;
12
13 pdev = to_pci_dev(dev);
14 if (!pdev)
15 return -ENODEV;
16
17 if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
18 return -ENOMEM;
19
20 if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
21 return -ENOMEM;
22
23 if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
24 pdev->subsystem_device))
25 return -ENOMEM;
26
27 if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
28 return -ENOMEM;
29
30 if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
31 pdev->vendor, pdev->device,
32 pdev->subsystem_vendor, pdev->subsystem_device,
33 (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
34 (u8)(pdev->class)))
35 return -ENOMEM;
36 return 0;
37}
drivers/pci/hotplug/cpcihp_zt5550.c+2−2
@@ -271,7 +271,7 @@ init_hc_error: · 270 unmodified lines
271 271
272}272}
273 273
274static void __devexit zt5550_hc_remove_one(struct pci_dev *pdev)274static void zt5550_hc_remove_one(struct pci_dev *pdev)
275{275{
276 cpci_hp_stop();276 cpci_hp_stop();
277 cpci_hp_unregister_bus(bus0);277 cpci_hp_unregister_bus(bus0);
@@ -290,7 +290,7 @@ static struct pci_driver zt5550_hc_driver = { · 12 unmodified lines
290 .name = "zt5550_hc",290 .name = "zt5550_hc",
291 .id_table = zt5550_hc_pci_tbl,291 .id_table = zt5550_hc_pci_tbl,
292 .probe = zt5550_hc_init_one,292 .probe = zt5550_hc_init_one,
293 .remove = __devexit_p(zt5550_hc_remove_one),293 .remove = zt5550_hc_remove_one,
294};294};
295 295
296static int __init zt5550_init(void)296static int __init zt5550_init(void)
drivers/pci/ioapic.c+3−3
@@ -27,7 +27,7 @@ struct ioapic { · 26 unmodified lines
27 u32 gsi_base;27 u32 gsi_base;
28};28};
29 29
30static int __devinit ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)30static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)
31{31{
32 acpi_handle handle;32 acpi_handle handle;
33 acpi_status status;33 acpi_status status;
@@ -88,7 +88,7 @@ exit_free: · 54 unmodified lines
88 return -ENODEV;88 return -ENODEV;
89}89}
90 90
91static void __devexit ioapic_remove(struct pci_dev *dev)91static void ioapic_remove(struct pci_dev *dev)
92{92{
93 struct ioapic *ioapic = pci_get_drvdata(dev);93 struct ioapic *ioapic = pci_get_drvdata(dev);
94 94
@@ -110,7 +110,7 @@ static struct pci_driver ioapic_driver = { · 15 unmodified lines
110 .name = "ioapic",110 .name = "ioapic",
111 .id_table = ioapic_devices,111 .id_table = ioapic_devices,
112 .probe = ioapic_probe,112 .probe = ioapic_probe,
113 .remove = __devexit_p(ioapic_remove),113 .remove = ioapic_remove,
114};114};
115 115
116static int __init ioapic_init(void)116static int __init ioapic_init(void)
drivers/pci/pci-driver.c+30−12
@@ -89,10 +89,6 @@ static void pci_free_dynids(struct pci_driver *drv) · 88 unmodified lines
89 spin_unlock(&drv->dynids.lock);89 spin_unlock(&drv->dynids.lock);
90}90}
91 91
92/*
93 * Dynamic device ID manipulation via sysfs is disabled for !CONFIG_HOTPLUG
94 */
95#ifdef CONFIG_HOTPLUG
96/**92/**
97 * store_new_id - sysfs frontend to pci_add_dynid()93 * store_new_id - sysfs frontend to pci_add_dynid()
98 * @driver: target device driver94 * @driver: target device driver
@@ -191,10 +187,6 @@ static struct driver_attribute pci_drv_attrs[] = { · 92 unmodified lines
191 __ATTR_NULL,187 __ATTR_NULL,
192};188};
193 189
194#else
195#define pci_drv_attrs NULL
196#endif /* CONFIG_HOTPLUG */
197
198/**190/**
199 * pci_match_id - See if a pci device matches a given pci_id table191 * pci_match_id - See if a pci device matches a given pci_id table
200 * @ids: array of PCI device id structures to search in192 * @ids: array of PCI device id structures to search in
@@ -1223,12 +1215,38 @@ void pci_dev_put(struct pci_dev *dev) · 1022 unmodified lines
1223 put_device(&dev->dev);1215 put_device(&dev->dev);
1224}1216}
1225 1217
1226#ifndef CONFIG_HOTPLUG1218static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
1227int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
1228{1219{
1229 return -ENODEV;1220 struct pci_dev *pdev;
1221
1222 if (!dev)
1223 return -ENODEV;
1224
1225 pdev = to_pci_dev(dev);
1226 if (!pdev)
1227 return -ENODEV;
1228
1229 if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
1230 return -ENOMEM;
1231
1232 if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
1233 return -ENOMEM;
1234
1235 if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
1236 pdev->subsystem_device))
1237 return -ENOMEM;
1238
1239 if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
1240 return -ENOMEM;
1241
1242 if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
1243 pdev->vendor, pdev->device,
1244 pdev->subsystem_vendor, pdev->subsystem_device,
1245 (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
1246 (u8)(pdev->class)))
1247 return -ENOMEM;
1248 return 0;
1230}1249}
1231#endif
1232 1250
1233struct bus_type pci_bus_type = {1251struct bus_type pci_bus_type = {
1234 .name = "pci",1252 .name = "pci",
drivers/pci/pci-sysfs.c+0−7
@@ -284,7 +284,6 @@ msi_bus_store(struct device *dev, struct device_attribute *attr, · 283 unmodified lines
284 return count;284 return count;
285}285}
286 286
287#ifdef CONFIG_HOTPLUG
288static DEFINE_MUTEX(pci_remove_rescan_mutex);287static DEFINE_MUTEX(pci_remove_rescan_mutex);
289static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,288static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
290 size_t count)289 size_t count)
@@ -377,8 +376,6 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, · 86 unmodified lines
377 return count;376 return count;
378}377}
379 378
380#endif
381
382#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)379#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
383static ssize_t d3cold_allowed_store(struct device *dev,380static ssize_t d3cold_allowed_store(struct device *dev,
384 struct device_attribute *attr,381 struct device_attribute *attr,
@@ -424,10 +421,8 @@ struct device_attribute pci_dev_attrs[] = { · 39 unmodified lines
424 __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),421 __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
425 broken_parity_status_show,broken_parity_status_store),422 broken_parity_status_show,broken_parity_status_store),
426 __ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),423 __ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),
427#ifdef CONFIG_HOTPLUG
428 __ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),424 __ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),
429 __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),425 __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),
430#endif
431#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)426#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
432 __ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),427 __ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),
433#endif428#endif
@@ -435,9 +430,7 @@ struct device_attribute pci_dev_attrs[] = { · 1 unmodified line
435};430};
436 431
437struct device_attribute pcibus_dev_attrs[] = {432struct device_attribute pcibus_dev_attrs[] = {
438#ifdef CONFIG_HOTPLUG
439 __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store),433 __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store),
440#endif
441 __ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL),434 __ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL),
442 __ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL),435 __ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL),
443 __ATTR_NULL,436 __ATTR_NULL,
drivers/pci/pci.c+2−2
@@ -86,7 +86,7 @@ enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_TUNE_OFF; · 85 unmodified lines
86 * the dfl or actual value as it sees fit. Don't forget this is86 * the dfl or actual value as it sees fit. Don't forget this is
87 * measured in 32-bit words, not bytes.87 * measured in 32-bit words, not bytes.
88 */88 */
89u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES >> 2;89u8 pci_dfl_cache_line_size = L1_CACHE_BYTES >> 2;
90u8 pci_cache_line_size;90u8 pci_cache_line_size;
91 91
92/*92/*
@@ -3857,7 +3857,7 @@ static int __init pci_resource_alignment_sysfs_init(void) · 3764 unmodified lines
3857 3857
3858late_initcall(pci_resource_alignment_sysfs_init);3858late_initcall(pci_resource_alignment_sysfs_init);
3859 3859
3860static void __devinit pci_no_domains(void)3860static void pci_no_domains(void)
3861{3861{
3862#ifdef CONFIG_PCI_DOMAINS3862#ifdef CONFIG_PCI_DOMAINS
3863 pci_domains_supported = 0;3863 pci_domains_supported = 0;
drivers/pci/pci.h+0−5
@@ -8,7 +8,6 @@ · 7 unmodified lines
8 8
9/* Functions internal to the PCI core code */9/* Functions internal to the PCI core code */
10 10
11extern int pci_uevent(struct device *dev, struct kobj_uevent_env *env);
12extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);11extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
13extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);12extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
14#if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI)13#if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI)
@@ -159,11 +158,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev) · 144 unmodified lines
159}158}
160extern struct device_attribute pci_dev_attrs[];159extern struct device_attribute pci_dev_attrs[];
161extern struct device_attribute pcibus_dev_attrs[];160extern struct device_attribute pcibus_dev_attrs[];
162#ifdef CONFIG_HOTPLUG
163extern struct bus_attribute pci_bus_attrs[];161extern struct bus_attribute pci_bus_attrs[];
164#else
165#define pci_bus_attrs NULL
166#endif
167 162
168 163
169/**164/**
drivers/pci/pcie/aer/aerdrv.c+2−2
@@ -41,7 +41,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); · 40 unmodified lines
41MODULE_DESCRIPTION(DRIVER_DESC);41MODULE_DESCRIPTION(DRIVER_DESC);
42MODULE_LICENSE("GPL");42MODULE_LICENSE("GPL");
43 43
44static int __devinit aer_probe(struct pcie_device *dev);44static int aer_probe(struct pcie_device *dev);
45static void aer_remove(struct pcie_device *dev);45static void aer_remove(struct pcie_device *dev);
46static pci_ers_result_t aer_error_detected(struct pci_dev *dev,46static pci_ers_result_t aer_error_detected(struct pci_dev *dev,
47 enum pci_channel_state error);47 enum pci_channel_state error);
@@ -300,7 +300,7 @@ static void aer_remove(struct pcie_device *dev) · 252 unmodified lines
300 *300 *
301 * Invoked when PCI Express bus loads AER service driver.301 * Invoked when PCI Express bus loads AER service driver.
302 */302 */
303static int __devinit aer_probe(struct pcie_device *dev)303static int aer_probe(struct pcie_device *dev)
304{304{
305 int status;305 int status;
306 struct aer_rpc *rpc;306 struct aer_rpc *rpc;
drivers/pci/pcie/portdrv_pci.c+1−1
@@ -182,7 +182,7 @@ static const struct pci_device_id port_runtime_pm_black_list[] = { · 181 unmodified lines
182 * this port device.182 * this port device.
183 *183 *
184 */184 */
185static int __devinit pcie_portdrv_probe(struct pci_dev *dev,185static int pcie_portdrv_probe(struct pci_dev *dev,
186 const struct pci_device_id *id)186 const struct pci_device_id *id)
187{187{
188 int status;188 int status;
drivers/pci/probe.c+9−11
@@ -305,7 +305,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) · 304 unmodified lines
305 }305 }
306}306}
307 307
308static void __devinit pci_read_bridge_io(struct pci_bus *child)308static void pci_read_bridge_io(struct pci_bus *child)
309{309{
310 struct pci_dev *dev = child->self;310 struct pci_dev *dev = child->self;
311 u8 io_base_lo, io_limit_lo;311 u8 io_base_lo, io_limit_lo;
@@ -345,7 +345,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) · 33 unmodified lines
345 }345 }
346}346}
347 347
348static void __devinit pci_read_bridge_mmio(struct pci_bus *child)348static void pci_read_bridge_mmio(struct pci_bus *child)
349{349{
350 struct pci_dev *dev = child->self;350 struct pci_dev *dev = child->self;
351 u16 mem_base_lo, mem_limit_lo;351 u16 mem_base_lo, mem_limit_lo;
@@ -367,7 +367,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) · 15 unmodified lines
367 }367 }
368}368}
369 369
370static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)370static void pci_read_bridge_mmio_pref(struct pci_bus *child)
371{371{
372 struct pci_dev *dev = child->self;372 struct pci_dev *dev = child->self;
373 u16 mem_base_lo, mem_limit_lo;373 u16 mem_base_lo, mem_limit_lo;
@@ -417,7 +417,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) · 43 unmodified lines
417 }417 }
418}418}
419 419
420void __devinit pci_read_bridge_bases(struct pci_bus *child)420void pci_read_bridge_bases(struct pci_bus *child)
421{421{
422 struct pci_dev *dev = child->self;422 struct pci_dev *dev = child->self;
423 struct resource *res;423 struct resource *res;
@@ -705,7 +705,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) · 281 unmodified lines
705 * them, we proceed to assigning numbers to the remaining buses in705 * them, we proceed to assigning numbers to the remaining buses in
706 * order to avoid overlaps between old and new bus numbers.706 * order to avoid overlaps between old and new bus numbers.
707 */707 */
708int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)708int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
709{709{
710 struct pci_bus *child;710 struct pci_bus *child;
711 int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);711 int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
@@ -1586,7 +1586,7 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss) · 874 unmodified lines
1586}1586}
1587EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);1587EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);
1588 1588
1589unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)1589unsigned int pci_scan_child_bus(struct pci_bus *bus)
1590{1590{
1591 unsigned int devfn, pass, max = bus->busn_res.start;1591 unsigned int devfn, pass, max = bus->busn_res.start;
1592 struct pci_dev *dev;1592 struct pci_dev *dev;
@@ -1790,7 +1790,7 @@ void pci_bus_release_busn_res(struct pci_bus *b) · 197 unmodified lines
1790 res, ret ? "can not be" : "is");1790 res, ret ? "can not be" : "is");
1791}1791}
1792 1792
1793struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,1793struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
1794 struct pci_ops *ops, void *sysdata, struct list_head *resources)1794 struct pci_ops *ops, void *sysdata, struct list_head *resources)
1795{1795{
1796 struct pci_host_bridge_window *window;1796 struct pci_host_bridge_window *window;
@@ -1826,7 +1826,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, · 29 unmodified lines
1826EXPORT_SYMBOL(pci_scan_root_bus);1826EXPORT_SYMBOL(pci_scan_root_bus);
1827 1827
1828/* Deprecated; use pci_scan_root_bus() instead */1828/* Deprecated; use pci_scan_root_bus() instead */
1829struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,1829struct pci_bus *pci_scan_bus_parented(struct device *parent,
1830 int bus, struct pci_ops *ops, void *sysdata)1830 int bus, struct pci_ops *ops, void *sysdata)
1831{1831{
1832 LIST_HEAD(resources);1832 LIST_HEAD(resources);
@@ -1844,7 +1844,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, · 11 unmodified lines
1844}1844}
1845EXPORT_SYMBOL(pci_scan_bus_parented);1845EXPORT_SYMBOL(pci_scan_bus_parented);
1846 1846
1847struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,1847struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
1848 void *sysdata)1848 void *sysdata)
1849{1849{
1850 LIST_HEAD(resources);1850 LIST_HEAD(resources);
@@ -1864,7 +1864,6 @@ struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, · 13 unmodified lines
1864}1864}
1865EXPORT_SYMBOL(pci_scan_bus);1865EXPORT_SYMBOL(pci_scan_bus);
1866 1866
1867#ifdef CONFIG_HOTPLUG
1868/**1867/**
1869 * pci_rescan_bus_bridge_resize - scan a PCI bus for devices.1868 * pci_rescan_bus_bridge_resize - scan a PCI bus for devices.
1870 * @bridge: PCI bridge for the bus to scan1869 * @bridge: PCI bridge for the bus to scan
@@ -1894,7 +1893,6 @@ EXPORT_SYMBOL(pci_add_new_bus); · 23 unmodified lines
1894EXPORT_SYMBOL(pci_scan_slot);1893EXPORT_SYMBOL(pci_scan_slot);
1895EXPORT_SYMBOL(pci_scan_bridge);1894EXPORT_SYMBOL(pci_scan_bridge);
1896EXPORT_SYMBOL_GPL(pci_scan_child_bus);1895EXPORT_SYMBOL_GPL(pci_scan_child_bus);
1897#endif
1898 1896
1899static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)1897static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)
1900{1898{
drivers/pci/quirks.c+66−66
@@ -37,7 +37,7 @@ · 36 unmodified lines
37 * key system devices. For devices that need to have mmio decoding always-on,37 * key system devices. For devices that need to have mmio decoding always-on,
38 * we need to set the dev->mmio_always_on bit.38 * we need to set the dev->mmio_always_on bit.
39 */39 */
40static void __devinit quirk_mmio_always_on(struct pci_dev *dev)40static void quirk_mmio_always_on(struct pci_dev *dev)
41{41{
42 dev->mmio_always_on = 1;42 dev->mmio_always_on = 1;
43}43}
@@ -48,7 +48,7 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, · 4 unmodified lines
48 * Mark this device with a broken_parity_status, to allow48 * Mark this device with a broken_parity_status, to allow
49 * PCI scanning code to "skip" this now blacklisted device.49 * PCI scanning code to "skip" this now blacklisted device.
50 */50 */
51static void __devinit quirk_mellanox_tavor(struct pci_dev *dev)51static void quirk_mellanox_tavor(struct pci_dev *dev)
52{52{
53 dev->broken_parity_status = 1; /* This device gives false positives */53 dev->broken_parity_status = 1; /* This device gives false positives */
54}54}
@@ -83,7 +83,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_p · 28 unmodified lines
83 This appears to be BIOS not version dependent. So presumably there is a 83 This appears to be BIOS not version dependent. So presumably there is a
84 chipset level fix */84 chipset level fix */
85 85
86static void __devinit quirk_isa_dma_hangs(struct pci_dev *dev)86static void quirk_isa_dma_hangs(struct pci_dev *dev)
87{87{
88 if (!isa_dma_bridge_buggy) {88 if (!isa_dma_bridge_buggy) {
89 isa_dma_bridge_buggy=1;89 isa_dma_bridge_buggy=1;
@@ -106,7 +106,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_d · 16 unmodified lines
106 * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear106 * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear
107 * for some HT machines to use C4 w/o hanging.107 * for some HT machines to use C4 w/o hanging.
108 */108 */
109static void __devinit quirk_tigerpoint_bm_sts(struct pci_dev *dev)109static void quirk_tigerpoint_bm_sts(struct pci_dev *dev)
110{110{
111 u32 pmbase;111 u32 pmbase;
112 u16 pm1a;112 u16 pm1a;
@@ -125,7 +125,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk · 12 unmodified lines
125/*125/*
126 * Chipsets where PCI->PCI transfers vanish or hang126 * Chipsets where PCI->PCI transfers vanish or hang
127 */127 */
128static void __devinit quirk_nopcipci(struct pci_dev *dev)128static void quirk_nopcipci(struct pci_dev *dev)
129{129{
130 if ((pci_pci_problems & PCIPCI_FAIL)==0) {130 if ((pci_pci_problems & PCIPCI_FAIL)==0) {
131 dev_info(&dev->dev, "Disabling direct PCI/PCI transfers\n");131 dev_info(&dev->dev, "Disabling direct PCI/PCI transfers\n");
@@ -135,7 +135,7 @@ static void __devinit quirk_nopcipci(struct pci_dev *dev) · 3 unmodified lines
135DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci);135DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci);
136DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci);136DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci);
137 137
138static void __devinit quirk_nopciamd(struct pci_dev *dev)138static void quirk_nopciamd(struct pci_dev *dev)
139{139{
140 u8 rev;140 u8 rev;
141 pci_read_config_byte(dev, 0x08, &rev);141 pci_read_config_byte(dev, 0x08, &rev);
@@ -150,7 +150,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopci · 8 unmodified lines
150/*150/*
151 * Triton requires workarounds to be used by the drivers151 * Triton requires workarounds to be used by the drivers
152 */152 */
153static void __devinit quirk_triton(struct pci_dev *dev)153static void quirk_triton(struct pci_dev *dev)
154{154{
155 if ((pci_pci_problems&PCIPCI_TRITON)==0) {155 if ((pci_pci_problems&PCIPCI_TRITON)==0) {
156 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");156 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
@@ -229,7 +229,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, quirk_viala · 72 unmodified lines
229/*229/*
230 * VIA Apollo VP3 needs ETBF on BT848/878230 * VIA Apollo VP3 needs ETBF on BT848/878
231 */231 */
232static void __devinit quirk_viaetbf(struct pci_dev *dev)232static void quirk_viaetbf(struct pci_dev *dev)
233{233{
234 if ((pci_pci_problems&PCIPCI_VIAETBF)==0) {234 if ((pci_pci_problems&PCIPCI_VIAETBF)==0) {
235 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");235 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
@@ -238,7 +238,7 @@ static void __devinit quirk_viaetbf(struct pci_dev *dev) · 2 unmodified lines
238}238}
239DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_viaetbf);239DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_viaetbf);
240 240
241static void __devinit quirk_vsfx(struct pci_dev *dev)241static void quirk_vsfx(struct pci_dev *dev)
242{242{
243 if ((pci_pci_problems&PCIPCI_VSFX)==0) {243 if ((pci_pci_problems&PCIPCI_VSFX)==0) {
244 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");244 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
@@ -253,7 +253,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576, quirk_vsfx) · 8 unmodified lines
253 * workaround applied too253 * workaround applied too
254 * [Info kindly provided by ALi]254 * [Info kindly provided by ALi]
255 */ 255 */
256static void __devinit quirk_alimagik(struct pci_dev *dev)256static void quirk_alimagik(struct pci_dev *dev)
257{257{
258 if ((pci_pci_problems&PCIPCI_ALIMAGIK)==0) {258 if ((pci_pci_problems&PCIPCI_ALIMAGIK)==0) {
259 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");259 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
@@ -267,7 +267,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1651, quirk_alimag · 7 unmodified lines
267 * Natoma has some interesting boundary conditions with Zoran stuff267 * Natoma has some interesting boundary conditions with Zoran stuff
268 * at least268 * at least
269 */269 */
270static void __devinit quirk_natoma(struct pci_dev *dev)270static void quirk_natoma(struct pci_dev *dev)
271{271{
272 if ((pci_pci_problems&PCIPCI_NATOMA)==0) {272 if ((pci_pci_problems&PCIPCI_NATOMA)==0) {
273 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");273 dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
@@ -285,7 +285,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, qu · 11 unmodified lines
285 * This chip can cause PCI parity errors if config register 0xA0 is read285 * This chip can cause PCI parity errors if config register 0xA0 is read
286 * while DMAs are occurring.286 * while DMAs are occurring.
287 */287 */
288static void __devinit quirk_citrine(struct pci_dev *dev)288static void quirk_citrine(struct pci_dev *dev)
289{289{
290 dev->cfg_size = 0xA0;290 dev->cfg_size = 0xA0;
291}291}
@@ -295,7 +295,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE, quirk_cit · 3 unmodified lines
295 * S3 868 and 968 chips report region size equal to 32M, but they decode 64M.295 * S3 868 and 968 chips report region size equal to 32M, but they decode 64M.
296 * If it's needed, re-allocate the region.296 * If it's needed, re-allocate the region.
297 */297 */
298static void __devinit quirk_s3_64M(struct pci_dev *dev)298static void quirk_s3_64M(struct pci_dev *dev)
299{299{
300 struct resource *r = &dev->resource[0];300 struct resource *r = &dev->resource[0];
301 301
@@ -313,7 +313,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968, quirk_s3_64M); · 11 unmodified lines
313 * BAR0 should be 8 bytes; instead, it may be set to something like 8k313 * BAR0 should be 8 bytes; instead, it may be set to something like 8k
314 * (which conflicts w/ BAR1's memory range).314 * (which conflicts w/ BAR1's memory range).
315 */315 */
316static void __devinit quirk_cs5536_vsa(struct pci_dev *dev)316static void quirk_cs5536_vsa(struct pci_dev *dev)
317{317{
318 if (pci_resource_len(dev, 0) != 8) {318 if (pci_resource_len(dev, 0) != 8) {
319 struct resource *res = &dev->resource[0];319 struct resource *res = &dev->resource[0];
@@ -324,7 +324,7 @@ static void __devinit quirk_cs5536_vsa(struct pci_dev *dev) · 4 unmodified lines
324}324}
325DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);325DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);
326 326
327static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,327static void quirk_io_region(struct pci_dev *dev, unsigned region,
328 unsigned size, int nr, const char *name)328 unsigned size, int nr, const char *name)
329{329{
330 region &= ~(size-1);330 region &= ~(size-1);
@@ -352,7 +352,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, · 21 unmodified lines
352 * ATI Northbridge setups MCE the processor if you even352 * ATI Northbridge setups MCE the processor if you even
353 * read somewhere between 0x3b0->0x3bb or read 0x3d3353 * read somewhere between 0x3b0->0x3bb or read 0x3d3
354 */354 */
355static void __devinit quirk_ati_exploding_mce(struct pci_dev *dev)355static void quirk_ati_exploding_mce(struct pci_dev *dev)
356{356{
357 dev_info(&dev->dev, "ATI Northbridge, reserving I/O ports 0x3b0 to 0x3bb\n");357 dev_info(&dev->dev, "ATI Northbridge, reserving I/O ports 0x3b0 to 0x3bb\n");
358 /* Mae rhaid i ni beidio ag edrych ar y lleoliadiau I/O hyn */358 /* Mae rhaid i ni beidio ag edrych ar y lleoliadiau I/O hyn */
@@ -372,7 +372,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_ · 13 unmodified lines
372 * 0xE0 (64 bytes of ACPI registers)372 * 0xE0 (64 bytes of ACPI registers)
373 * 0xE2 (32 bytes of SMB registers)373 * 0xE2 (32 bytes of SMB registers)
374 */374 */
375static void __devinit quirk_ali7101_acpi(struct pci_dev *dev)375static void quirk_ali7101_acpi(struct pci_dev *dev)
376{376{
377 u16 region;377 u16 region;
378 378
@@ -440,7 +440,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int · 61 unmodified lines
440 * 0x90 (16 bytes of SMB registers)440 * 0x90 (16 bytes of SMB registers)
441 * and a few strange programmable PIIX4 device resources.441 * and a few strange programmable PIIX4 device resources.
442 */442 */
443static void __devinit quirk_piix4_acpi(struct pci_dev *dev)443static void quirk_piix4_acpi(struct pci_dev *dev)
444{444{
445 u32 region, res_a;445 u32 region, res_a;
446 446
@@ -489,7 +489,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3, qui · 42 unmodified lines
489 * 0x40 (128 bytes of ACPI, GPIO & TCO registers)489 * 0x40 (128 bytes of ACPI, GPIO & TCO registers)
490 * 0x58 (64 bytes of GPIO I/O space)490 * 0x58 (64 bytes of GPIO I/O space)
491 */491 */
492static void __devinit quirk_ich4_lpc_acpi(struct pci_dev *dev)492static void quirk_ich4_lpc_acpi(struct pci_dev *dev)
493{493{
494 u32 region;494 u32 region;
495 u8 enable;495 u8 enable;
@@ -531,7 +531,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, · 35 unmodified lines
531DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, quirk_ich4_lpc_acpi);531DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, quirk_ich4_lpc_acpi);
532DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1, quirk_ich4_lpc_acpi);532DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1, quirk_ich4_lpc_acpi);
533 533
534static void __devinit ich6_lpc_acpi_gpio(struct pci_dev *dev)534static void ich6_lpc_acpi_gpio(struct pci_dev *dev)
535{535{
536 u32 region;536 u32 region;
537 u8 enable;537 u8 enable;
@@ -555,7 +555,7 @@ static void __devinit ich6_lpc_acpi_gpio(struct pci_dev *dev) · 17 unmodified lines
555 }555 }
556}556}
557 557
558static void __devinit ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name, int dynsize)558static void ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name, int dynsize)
559{559{
560 u32 val;560 u32 val;
561 u32 size, base;561 u32 size, base;
@@ -583,7 +583,7 @@ static void __devinit ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg, · 21 unmodified lines
583 dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base+size-1);583 dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base+size-1);
584}584}
585 585
586static void __devinit quirk_ich6_lpc(struct pci_dev *dev)586static void quirk_ich6_lpc(struct pci_dev *dev)
587{587{
588 /* Shared ACPI/GPIO decode with all ICH6+ */588 /* Shared ACPI/GPIO decode with all ICH6+ */
589 ich6_lpc_acpi_gpio(dev);589 ich6_lpc_acpi_gpio(dev);
@@ -595,7 +595,7 @@ static void __devinit quirk_ich6_lpc(struct pci_dev *dev) · 5 unmodified lines
595DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, quirk_ich6_lpc);595DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, quirk_ich6_lpc);
596DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, quirk_ich6_lpc);596DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, quirk_ich6_lpc);
597 597
598static void __devinit ich7_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name)598static void ich7_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name)
599{599{
600 u32 val;600 u32 val;
601 u32 mask, base;601 u32 mask, base;
@@ -619,7 +619,7 @@ static void __devinit ich7_lpc_generic_decode(struct pci_dev *dev, unsigned reg, · 17 unmodified lines
619}619}
620 620
621/* ICH7-10 has the same common LPC generic IO decode registers */621/* ICH7-10 has the same common LPC generic IO decode registers */
622static void __devinit quirk_ich7_lpc(struct pci_dev *dev)622static void quirk_ich7_lpc(struct pci_dev *dev)
623{623{
624 /* We share the common ACPI/GPIO decode with ICH6 */624 /* We share the common ACPI/GPIO decode with ICH6 */
625 ich6_lpc_acpi_gpio(dev);625 ich6_lpc_acpi_gpio(dev);
@@ -648,7 +648,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_1, qui · 22 unmodified lines
648 * VIA ACPI: One IO region pointed to by longword at648 * VIA ACPI: One IO region pointed to by longword at
649 * 0x48 or 0x20 (256 bytes of ACPI registers)649 * 0x48 or 0x20 (256 bytes of ACPI registers)
650 */650 */
651static void __devinit quirk_vt82c586_acpi(struct pci_dev *dev)651static void quirk_vt82c586_acpi(struct pci_dev *dev)
652{652{
653 u32 region;653 u32 region;
654 654
@@ -666,7 +666,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_vt · 11 unmodified lines
666 * 0x70 (128 bytes of hardware monitoring register)666 * 0x70 (128 bytes of hardware monitoring register)
667 * 0x90 (16 bytes of SMB registers)667 * 0x90 (16 bytes of SMB registers)
668 */668 */
669static void __devinit quirk_vt82c686_acpi(struct pci_dev *dev)669static void quirk_vt82c686_acpi(struct pci_dev *dev)
670{670{
671 u16 hm;671 u16 hm;
672 u32 smb;672 u32 smb;
@@ -688,7 +688,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt · 15 unmodified lines
688 * 0x88 (128 bytes of power management registers)688 * 0x88 (128 bytes of power management registers)
689 * 0xd0 (16 bytes of SMB registers)689 * 0xd0 (16 bytes of SMB registers)
690 */690 */
691static void __devinit quirk_vt8235_acpi(struct pci_dev *dev)691static void quirk_vt8235_acpi(struct pci_dev *dev)
692{692{
693 u16 pm, smb;693 u16 pm, smb;
694 694
@@ -706,7 +706,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, quirk_vt8235 · 11 unmodified lines
706 * TI XIO2000a PCIe-PCI Bridge erroneously reports it supports fast back-to-back:706 * TI XIO2000a PCIe-PCI Bridge erroneously reports it supports fast back-to-back:
707 * Disable fast back-to-back on the secondary bus segment707 * Disable fast back-to-back on the secondary bus segment
708 */708 */
709static void __devinit quirk_xio2000a(struct pci_dev *dev)709static void quirk_xio2000a(struct pci_dev *dev)
710{710{
711 struct pci_dev *pdev;711 struct pci_dev *pdev;
712 u16 command;712 u16 command;
@@ -780,7 +780,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, quirk · 67 unmodified lines
780 * noapic specified. For the moment we assume it's the erratum. We may be wrong780 * noapic specified. For the moment we assume it's the erratum. We may be wrong
781 * of course. However the advice is demonstrably good even if so..781 * of course. However the advice is demonstrably good even if so..
782 */782 */
783static void __devinit quirk_amd_ioapic(struct pci_dev *dev)783static void quirk_amd_ioapic(struct pci_dev *dev)
784{784{
785 if (dev->revision >= 0x02) {785 if (dev->revision >= 0x02) {
786 dev_warn(&dev->dev, "I/O APIC: AMD Erratum #22 may be present. In the event of instability try\n");786 dev_warn(&dev->dev, "I/O APIC: AMD Erratum #22 may be present. In the event of instability try\n");
@@ -789,7 +789,7 @@ static void __devinit quirk_amd_ioapic(struct pci_dev *dev) · 2 unmodified lines
789}789}
790DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic);790DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic);
791 791
792static void __devinit quirk_ioapic_rmw(struct pci_dev *dev)792static void quirk_ioapic_rmw(struct pci_dev *dev)
793{793{
794 if (dev->devfn == 0 && dev->bus->number == 0)794 if (dev->devfn == 0 && dev->bus->number == 0)
795 sis_apic_bug = 1;795 sis_apic_bug = 1;
@@ -801,7 +801,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw); · 5 unmodified lines
801 * Some settings of MMRBC can lead to data corruption so block changes.801 * Some settings of MMRBC can lead to data corruption so block changes.
802 * See AMD 8131 HyperTransport PCI-X Tunnel Revision Guide802 * See AMD 8131 HyperTransport PCI-X Tunnel Revision Guide
803 */803 */
804static void __devinit quirk_amd_8131_mmrbc(struct pci_dev *dev)804static void quirk_amd_8131_mmrbc(struct pci_dev *dev)
805{805{
806 if (dev->subordinate && dev->revision <= 0x12) {806 if (dev->subordinate && dev->revision <= 0x12) {
807 dev_info(&dev->dev, "AMD8131 rev %x detected; "807 dev_info(&dev->dev, "AMD8131 rev %x detected; "
@@ -819,7 +819,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_ · 11 unmodified lines
819 * value of the ACPI SCI interrupt is only done for convenience.819 * value of the ACPI SCI interrupt is only done for convenience.
820 * -jgarzik820 * -jgarzik
821 */821 */
822static void __devinit quirk_via_acpi(struct pci_dev *d)822static void quirk_via_acpi(struct pci_dev *d)
823{823{
824 /*824 /*
825 * VIA ACPI device: SCI IRQ line in PCI config byte 0x42825 * VIA ACPI device: SCI IRQ line in PCI config byte 0x42
@@ -926,7 +926,7 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_vlink); · 100 unmodified lines
926 * We need to switch it off to be able to recognize the real926 * We need to switch it off to be able to recognize the real
927 * type of the chip.927 * type of the chip.
928 */928 */
929static void __devinit quirk_vt82c598_id(struct pci_dev *dev)929static void quirk_vt82c598_id(struct pci_dev *dev)
930{930{
931 pci_write_config_byte(dev, 0xfc, 0);931 pci_write_config_byte(dev, 0xfc, 0);
932 pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device);932 pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device);
@@ -978,7 +978,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C · 45 unmodified lines
978 * assigned to it. We force a larger allocation to ensure that978 * assigned to it. We force a larger allocation to ensure that
979 * nothing gets put too close to it.979 * nothing gets put too close to it.
980 */980 */
981static void __devinit quirk_dunord ( struct pci_dev * dev )981static void quirk_dunord(struct pci_dev *dev)
982{982{
983 struct resource *r = &dev->resource [1];983 struct resource *r = &dev->resource [1];
984 r->start = 0;984 r->start = 0;
@@ -992,7 +992,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DUNORD, PCI_DEVICE_ID_DUNORD_I3000, quirk · 7 unmodified lines
992 * in the ProgIf. Unfortunately, the ProgIf value is wrong - 0x80992 * in the ProgIf. Unfortunately, the ProgIf value is wrong - 0x80
993 * instead of 0x01.993 * instead of 0x01.
994 */994 */
995static void __devinit quirk_transparent_bridge(struct pci_dev *dev)995static void quirk_transparent_bridge(struct pci_dev *dev)
996{996{
997 dev->transparent = 1;997 dev->transparent = 1;
998}998}
@@ -1066,7 +1066,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA · 67 unmodified lines
1066/*1066/*
1067 * Serverworks CSB5 IDE does not fully support native mode1067 * Serverworks CSB5 IDE does not fully support native mode
1068 */1068 */
1069static void __devinit quirk_svwks_csb5ide(struct pci_dev *pdev)1069static void quirk_svwks_csb5ide(struct pci_dev *pdev)
1070{1070{
1071 u8 prog;1071 u8 prog;
1072 pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog);1072 pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog);
@@ -1082,7 +1082,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB · 9 unmodified lines
1082/*1082/*
1083 * Intel 82801CAM ICH3-M datasheet says IDE modes must be the same1083 * Intel 82801CAM ICH3-M datasheet says IDE modes must be the same
1084 */1084 */
1085static void __devinit quirk_ide_samemode(struct pci_dev *pdev)1085static void quirk_ide_samemode(struct pci_dev *pdev)
1086{1086{
1087 u8 prog;1087 u8 prog;
1088 1088
@@ -1101,7 +1101,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, qui · 12 unmodified lines
1101 * Some ATA devices break if put into D31101 * Some ATA devices break if put into D3
1102 */1102 */
1103 1103
1104static void __devinit quirk_no_ata_d3(struct pci_dev *pdev)1104static void quirk_no_ata_d3(struct pci_dev *pdev)
1105{1105{
1106 pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;1106 pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;
1107}1107}
@@ -1121,7 +1121,7 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID, · 13 unmodified lines
1121/* This was originally an Alpha specific thing, but it really fits here.1121/* This was originally an Alpha specific thing, but it really fits here.
1122 * The i82375 PCI/EISA bridge appears as non-classified. Fix that.1122 * The i82375 PCI/EISA bridge appears as non-classified. Fix that.
1123 */1123 */
1124static void __devinit quirk_eisa_bridge(struct pci_dev *dev)1124static void quirk_eisa_bridge(struct pci_dev *dev)
1125{1125{
1126 dev->class = PCI_CLASS_BRIDGE_EISA << 8;1126 dev->class = PCI_CLASS_BRIDGE_EISA << 8;
1127}1127}
@@ -1155,7 +1155,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_e · 27 unmodified lines
1155 */1155 */
1156static int asus_hides_smbus;1156static int asus_hides_smbus;
1157 1157
1158static void __devinit asus_hides_smbus_hostbridge(struct pci_dev *dev)1158static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
1159{1159{
1160 if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) {1160 if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) {
1161 if (dev->device == PCI_DEVICE_ID_INTEL_82845_HB)1161 if (dev->device == PCI_DEVICE_ID_INTEL_82845_HB)
@@ -1538,7 +1538,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB3 · 376 unmodified lines
1538#endif1538#endif
1539 1539
1540#ifdef CONFIG_X86_IO_APIC1540#ifdef CONFIG_X86_IO_APIC
1541static void __devinit quirk_alder_ioapic(struct pci_dev *pdev)1541static void quirk_alder_ioapic(struct pci_dev *pdev)
1542{1542{
1543 int i;1543 int i;
1544 1544
@@ -1561,7 +1561,7 @@ static void __devinit quirk_alder_ioapic(struct pci_dev *pdev) · 16 unmodified lines
1561DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic);1561DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic);
1562#endif1562#endif
1563 1563
1564static void __devinit quirk_pcie_mch(struct pci_dev *pdev)1564static void quirk_pcie_mch(struct pci_dev *pdev)
1565{1565{
1566 pci_msi_off(pdev);1566 pci_msi_off(pdev);
1567 pdev->no_msi = 1;1567 pdev->no_msi = 1;
@@ -1575,7 +1575,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quir · 7 unmodified lines
1575 * It's possible for the MSI to get corrupted if shpc and acpi1575 * It's possible for the MSI to get corrupted if shpc and acpi
1576 * are used together on certain PXH-based systems.1576 * are used together on certain PXH-based systems.
1577 */1577 */
1578static void __devinit quirk_pcie_pxh(struct pci_dev *dev)1578static void quirk_pcie_pxh(struct pci_dev *dev)
1579{1579{
1580 pci_msi_off(dev);1580 pci_msi_off(dev);
1581 dev->no_msi = 1;1581 dev->no_msi = 1;
@@ -1777,7 +1777,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS, qui · 195 unmodified lines
1777 * but the PIO transfers won't work if BAR0 falls at the odd 8 bytes.1777 * but the PIO transfers won't work if BAR0 falls at the odd 8 bytes.
1778 * Re-allocate the region if needed...1778 * Re-allocate the region if needed...
1779 */1779 */
1780static void __devinit quirk_tc86c001_ide(struct pci_dev *dev)1780static void quirk_tc86c001_ide(struct pci_dev *dev)
1781{1781{
1782 struct resource *r = &dev->resource[0];1782 struct resource *r = &dev->resource[0];
1783 1783
@@ -1790,7 +1790,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA_2, · 6 unmodified lines
1790 PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,1790 PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,
1791 quirk_tc86c001_ide);1791 quirk_tc86c001_ide);
1792 1792
1793static void __devinit quirk_netmos(struct pci_dev *dev)1793static void quirk_netmos(struct pci_dev *dev)
1794{1794{
1795 unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;1795 unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;
1796 unsigned int num_serial = dev->subsystem_device & 0xf;1796 unsigned int num_serial = dev->subsystem_device & 0xf;
@@ -1828,7 +1828,7 @@ static void __devinit quirk_netmos(struct pci_dev *dev) · 31 unmodified lines
1828DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID,1828DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID,
1829 PCI_CLASS_COMMUNICATION_SERIAL, 8, quirk_netmos);1829 PCI_CLASS_COMMUNICATION_SERIAL, 8, quirk_netmos);
1830 1830
1831static void __devinit quirk_e100_interrupt(struct pci_dev *dev)1831static void quirk_e100_interrupt(struct pci_dev *dev)
1832{1832{
1833 u16 command, pmcsr;1833 u16 command, pmcsr;
1834 u8 __iomem *csr;1834 u8 __iomem *csr;
@@ -1901,7 +1901,7 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, · 66 unmodified lines
1901 * The 82575 and 82598 may experience data corruption issues when transitioning1901 * The 82575 and 82598 may experience data corruption issues when transitioning
1902 * out of L0S. To prevent this we need to disable L0S on the pci-e link1902 * out of L0S. To prevent this we need to disable L0S on the pci-e link
1903 */1903 */
1904static void __devinit quirk_disable_aspm_l0s(struct pci_dev *dev)1904static void quirk_disable_aspm_l0s(struct pci_dev *dev)
1905{1905{
1906 dev_info(&dev->dev, "Disabling L0s\n");1906 dev_info(&dev->dev, "Disabling L0s\n");
1907 pci_disable_link_state(dev, PCIE_LINK_STATE_L0S);1907 pci_disable_link_state(dev, PCIE_LINK_STATE_L0S);
@@ -1921,7 +1921,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f1, quirk_disable_aspm_l0s); · 13 unmodified lines
1921DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f4, quirk_disable_aspm_l0s);1921DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f4, quirk_disable_aspm_l0s);
1922DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1508, quirk_disable_aspm_l0s);1922DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1508, quirk_disable_aspm_l0s);
1923 1923
1924static void __devinit fixup_rev1_53c810(struct pci_dev* dev)1924static void fixup_rev1_53c810(struct pci_dev *dev)
1925{1925{
1926 /* rev 1 ncr53c810 chips don't set the class at all which means1926 /* rev 1 ncr53c810 chips don't set the class at all which means
1927 * they don't get their resources remapped. Fix that here.1927 * they don't get their resources remapped. Fix that here.
@@ -1935,7 +1935,7 @@ static void __devinit fixup_rev1_53c810(struct pci_dev* dev) · 7 unmodified lines
1935DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);1935DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
1936 1936
1937/* Enable 1k I/O space granularity on the Intel P64H2 */1937/* Enable 1k I/O space granularity on the Intel P64H2 */
1938static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)1938static void quirk_p64h2_1k_io(struct pci_dev *dev)
1939{1939{
1940 u16 en1k;1940 u16 en1k;
1941 1941
@@ -1968,7 +1968,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, · 26 unmodified lines
1968DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,1968DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
1969 quirk_nvidia_ck804_pcie_aer_ext_cap);1969 quirk_nvidia_ck804_pcie_aer_ext_cap);
1970 1970
1971static void __devinit quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)1971static void quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
1972{1972{
1973 /*1973 /*
1974 * Disable PCI Bus Parking and PCI Master read caching on CX7001974 * Disable PCI Bus Parking and PCI Master read caching on CX700
@@ -2031,7 +2031,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0x324e, quirk_via_cx700_pci_parking_c · 56 unmodified lines
2031 * We believe that it is legal to read beyond the end tag and2031 * We believe that it is legal to read beyond the end tag and
2032 * therefore the solution is to limit the read/write length.2032 * therefore the solution is to limit the read/write length.
2033 */2033 */
2034static void __devinit quirk_brcm_570x_limit_vpd(struct pci_dev *dev)2034static void quirk_brcm_570x_limit_vpd(struct pci_dev *dev)
2035{2035{
2036 /*2036 /*
2037 * Only disable the VPD capability for 5706, 5706S, 5708,2037 * Only disable the VPD capability for 5706, 5706S, 5708,
@@ -2091,7 +2091,7 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM, · 53 unmodified lines
2091 * the DRBs - this is where we expose device 6.2091 * the DRBs - this is where we expose device 6.
2092 * http://www.x86-secret.com/articles/tweak/pat/patsecrets-2.htm2092 * http://www.x86-secret.com/articles/tweak/pat/patsecrets-2.htm
2093 */2093 */
2094static void __devinit quirk_unhide_mch_dev6(struct pci_dev *dev)2094static void quirk_unhide_mch_dev6(struct pci_dev *dev)
2095{2095{
2096 u8 reg;2096 u8 reg;
2097 2097
@@ -2115,7 +2115,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82875_HB, · 17 unmodified lines
2115 * supports link speed auto negotiation, but falsely sets2115 * supports link speed auto negotiation, but falsely sets
2116 * the link speed to 5GT/s.2116 * the link speed to 5GT/s.
2117 */2117 */
2118static void __devinit quirk_tile_plx_gen1(struct pci_dev *dev)2118static void quirk_tile_plx_gen1(struct pci_dev *dev)
2119{2119{
2120 if (tile_plx_gen1) {2120 if (tile_plx_gen1) {
2121 pci_write_config_dword(dev, 0x98, 0x1);2121 pci_write_config_dword(dev, 0x98, 0x1);
@@ -2132,7 +2132,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8624, quirk_tile_plx_gen1); · 10 unmodified lines
2132 * aware of it. Instead of setting the flag on all busses in the2132 * aware of it. Instead of setting the flag on all busses in the
2133 * machine, simply disable MSI globally.2133 * machine, simply disable MSI globally.
2134 */2134 */
2135static void __devinit quirk_disable_all_msi(struct pci_dev *dev)2135static void quirk_disable_all_msi(struct pci_dev *dev)
2136{2136{
2137 pci_no_msi();2137 pci_no_msi();
2138 dev_warn(&dev->dev, "MSI quirk detected; MSI disabled\n");2138 dev_warn(&dev->dev, "MSI quirk detected; MSI disabled\n");
@@ -2146,7 +2146,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3364, quirk_disab · 7 unmodified lines
2146DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disable_all_msi);2146DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disable_all_msi);
2147 2147
2148/* Disable MSI on chipsets that are known to not support it */2148/* Disable MSI on chipsets that are known to not support it */
2149static void __devinit quirk_disable_msi(struct pci_dev *dev)2149static void quirk_disable_msi(struct pci_dev *dev)
2150{2150{
2151 if (dev->subordinate) {2151 if (dev->subordinate) {
2152 dev_warn(&dev->dev, "MSI quirk detected; "2152 dev_warn(&dev->dev, "MSI quirk detected; "
@@ -2164,7 +2164,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x5a3f, quirk_disable_msi); · 11 unmodified lines
2164 * we use the possible vendor/device IDs of the host bridge for the2164 * we use the possible vendor/device IDs of the host bridge for the
2165 * declared quirk, and search for the APC bridge by slot number.2165 * declared quirk, and search for the APC bridge by slot number.
2166 */2166 */
2167static void __devinit quirk_amd_780_apc_msi(struct pci_dev *host_bridge)2167static void quirk_amd_780_apc_msi(struct pci_dev *host_bridge)
2168{2168{
2169 struct pci_dev *apc_bridge;2169 struct pci_dev *apc_bridge;
2170 2170
@@ -2272,7 +2272,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8132_BRIDGE, · 101 unmodified lines
2272 * for the MCP55 NIC. It is not yet determined whether the msi problem2272 * for the MCP55 NIC. It is not yet determined whether the msi problem
2273 * also affects other devices. As for now, turn off msi for this device.2273 * also affects other devices. As for now, turn off msi for this device.
2274 */2274 */
2275static void __devinit nvenet_msi_disable(struct pci_dev *dev)2275static void nvenet_msi_disable(struct pci_dev *dev)
2276{2276{
2277 const char *board_name = dmi_get_system_info(DMI_BOARD_NAME);2277 const char *board_name = dmi_get_system_info(DMI_BOARD_NAME);
2278 2278
@@ -2298,7 +2298,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, · 19 unmodified lines
2298 * we have it set correctly.2298 * we have it set correctly.
2299 * Note this is an undocumented register.2299 * Note this is an undocumented register.
2300 */2300 */
2301static void __devinit nvbridge_check_legacy_irq_routing(struct pci_dev *dev)2301static void nvbridge_check_legacy_irq_routing(struct pci_dev *dev)
2302{2302{
2303 u32 cfg;2303 u32 cfg;
2304 2304
@@ -2534,11 +2534,11 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, nv_msi_ht_cap_q · 229 unmodified lines
2534DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk_all);2534DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk_all);
2535DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk_all);2535DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk_all);
2536 2536
2537static void __devinit quirk_msi_intx_disable_bug(struct pci_dev *dev)2537static void quirk_msi_intx_disable_bug(struct pci_dev *dev)
2538{2538{
2539 dev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG;2539 dev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG;
2540}2540}
2541static void __devinit quirk_msi_intx_disable_ati_bug(struct pci_dev *dev)2541static void quirk_msi_intx_disable_ati_bug(struct pci_dev *dev)
2542{2542{
2543 struct pci_dev *p;2543 struct pci_dev *p;
2544 2544
@@ -2612,7 +2612,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1083, · 67 unmodified lines
2612 * kernel fails to allocate resources when hotplug device is 2612 * kernel fails to allocate resources when hotplug device is
2613 * inserted and PCI bus is rescanned.2613 * inserted and PCI bus is rescanned.
2614 */2614 */
2615static void __devinit quirk_hotplug_bridge(struct pci_dev *dev)2615static void quirk_hotplug_bridge(struct pci_dev *dev)
2616{2616{
2617 dev->is_hotplug_bridge = 1;2617 dev->is_hotplug_bridge = 1;
2618}2618}
@@ -2752,7 +2752,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x342e, vtd_mask_spec_errors); · 133 unmodified lines
2752DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);2752DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);
2753#endif2753#endif
2754 2754
2755static void __devinit fixup_ti816x_class(struct pci_dev* dev)2755static void fixup_ti816x_class(struct pci_dev *dev)
2756{2756{
2757 /* TI 816x devices do not have class code set when in PCIe boot mode */2757 /* TI 816x devices do not have class code set when in PCIe boot mode */
2758 dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n");2758 dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n");
@@ -2764,7 +2764,7 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800, · 5 unmodified lines
2764/* Some PCIe devices do not work reliably with the claimed maximum2764/* Some PCIe devices do not work reliably with the claimed maximum
2765 * payload size supported.2765 * payload size supported.
2766 */2766 */
2767static void __devinit fixup_mpss_256(struct pci_dev *dev)2767static void fixup_mpss_256(struct pci_dev *dev)
2768{2768{
2769 dev->pcie_mpss = 1; /* 256 bytes */2769 dev->pcie_mpss = 1; /* 256 bytes */
2770}2770}
@@ -2782,7 +2782,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SOLARFLARE, · 11 unmodified lines
2782 * coalescing must be disabled. Unfortunately, it cannot be re-enabled because2782 * coalescing must be disabled. Unfortunately, it cannot be re-enabled because
2783 * it is possible to hotplug a device with MPS of 256B.2783 * it is possible to hotplug a device with MPS of 256B.
2784 */2784 */
2785static void __devinit quirk_intel_mc_errata(struct pci_dev *dev)2785static void quirk_intel_mc_errata(struct pci_dev *dev)
2786{2786{
2787 int err;2787 int err;
2788 u16 rcc;2788 u16 rcc;
@@ -2888,7 +2888,7 @@ static void fixup_debug_report(struct pci_dev *dev, ktime_t calltime, · 99 unmodified lines
2888 * This resolves crashes often seen on monitor unplug.2888 * This resolves crashes often seen on monitor unplug.
2889 */2889 */
2890#define I915_DEIER_REG 0x4400c2890#define I915_DEIER_REG 0x4400c
2891static void __devinit disable_igfx_irq(struct pci_dev *dev)2891static void disable_igfx_irq(struct pci_dev *dev)
2892{2892{
2893 void __iomem *regs = pci_iomap(dev, 0, 0);2893 void __iomem *regs = pci_iomap(dev, 0, 0);
2894 if (regs == NULL) {2894 if (regs == NULL) {
@@ -2914,7 +2914,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); · 19 unmodified lines
2914 * PCI_COMMAND_INTX_DISABLE works though they actually do not properly2914 * PCI_COMMAND_INTX_DISABLE works though they actually do not properly
2915 * support this feature.2915 * support this feature.
2916 */2916 */
2917static void __devinit quirk_broken_intx_masking(struct pci_dev *dev)2917static void quirk_broken_intx_masking(struct pci_dev *dev)
2918{2918{
2919 dev->broken_intx_masking = 1;2919 dev->broken_intx_masking = 1;
2920}2920}
drivers/pci/xen-pcifront.c+5−5
@@ -412,7 +412,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data) · 411 unmodified lines
412 return 0;412 return 0;
413}413}
414 414
415static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,415static int pcifront_scan_bus(struct pcifront_device *pdev,
416 unsigned int domain, unsigned int bus,416 unsigned int domain, unsigned int bus,
417 struct pci_bus *b)417 struct pci_bus *b)
418{418{
@@ -441,7 +441,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev, · 22 unmodified lines
441 return 0;441 return 0;
442}442}
443 443
444static int __devinit pcifront_scan_root(struct pcifront_device *pdev,444static int pcifront_scan_root(struct pcifront_device *pdev,
445 unsigned int domain, unsigned int bus)445 unsigned int domain, unsigned int bus)
446{446{
447 struct pci_bus *b;447 struct pci_bus *b;
@@ -503,7 +503,7 @@ err_out: · 55 unmodified lines
503 return err;503 return err;
504}504}
505 505
506static int __devinit pcifront_rescan_root(struct pcifront_device *pdev,506static int pcifront_rescan_root(struct pcifront_device *pdev,
507 unsigned int domain, unsigned int bus)507 unsigned int domain, unsigned int bus)
508{508{
509 int err;509 int err;
@@ -834,7 +834,7 @@ out: · 324 unmodified lines
834 return err;834 return err;
835}835}
836 836
837static int __devinit pcifront_try_connect(struct pcifront_device *pdev)837static int pcifront_try_connect(struct pcifront_device *pdev)
838{838{
839 int err = -EFAULT;839 int err = -EFAULT;
840 int i, num_roots, len;840 int i, num_roots, len;
@@ -924,7 +924,7 @@ out: · 83 unmodified lines
924 return err;924 return err;
925}925}
926 926
927static int __devinit pcifront_attach_devices(struct pcifront_device *pdev)927static int pcifront_attach_devices(struct pcifront_device *pdev)
928{928{
929 int err = -EFAULT;929 int err = -EFAULT;
930 int i, num_roots, len;930 int i, num_roots, len;
drivers/pcmcia/bcm63xx_pcmcia.c+6−6
@@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = { · 322 unmodified lines
323/*323/*
324 * register pcmcia socket to core324 * register pcmcia socket to core
325 */325 */
326static int __devinit bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)326static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
327{327{
328 struct bcm63xx_pcmcia_socket *skt;328 struct bcm63xx_pcmcia_socket *skt;
329 struct pcmcia_socket *sock;329 struct pcmcia_socket *sock;
@@ -436,7 +436,7 @@ err: · 106 unmodified lines
436 return ret;436 return ret;
437}437}
438 438
439static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)439static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
440{440{
441 struct bcm63xx_pcmcia_socket *skt;441 struct bcm63xx_pcmcia_socket *skt;
442 struct resource *res;442 struct resource *res;
@@ -453,7 +453,7 @@ static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) · 10 unmodified lines
453 453
454struct platform_driver bcm63xx_pcmcia_driver = {454struct platform_driver bcm63xx_pcmcia_driver = {
455 .probe = bcm63xx_drv_pcmcia_probe,455 .probe = bcm63xx_drv_pcmcia_probe,
456 .remove = __devexit_p(bcm63xx_drv_pcmcia_remove),456 .remove = bcm63xx_drv_pcmcia_remove,
457 .driver = {457 .driver = {
458 .name = "bcm63xx_pcmcia",458 .name = "bcm63xx_pcmcia",
459 .owner = THIS_MODULE,459 .owner = THIS_MODULE,
@@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = { · 1 unmodified line
461};461};
462 462
463#ifdef CONFIG_CARDBUS463#ifdef CONFIG_CARDBUS
464static int __devinit bcm63xx_cb_probe(struct pci_dev *dev,464static int bcm63xx_cb_probe(struct pci_dev *dev,
465 const struct pci_device_id *id)465 const struct pci_device_id *id)
466{466{
467 /* keep pci device */467 /* keep pci device */
@@ -469,7 +469,7 @@ static int __devinit bcm63xx_cb_probe(struct pci_dev *dev, · 1 unmodified line
469 return platform_driver_register(&bcm63xx_pcmcia_driver);469 return platform_driver_register(&bcm63xx_pcmcia_driver);
470}470}
471 471
472static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)472static void bcm63xx_cb_exit(struct pci_dev *dev)
473{473{
474 platform_driver_unregister(&bcm63xx_pcmcia_driver);474 platform_driver_unregister(&bcm63xx_pcmcia_driver);
475 bcm63xx_cb_dev = NULL;475 bcm63xx_cb_dev = NULL;
@@ -503,7 +503,7 @@ static struct pci_driver bcm63xx_cardbus_driver = { · 27 unmodified lines
503 .name = "bcm63xx_cardbus",503 .name = "bcm63xx_cardbus",
504 .id_table = bcm63xx_cb_table,504 .id_table = bcm63xx_cb_table,
505 .probe = bcm63xx_cb_probe,505 .probe = bcm63xx_cb_probe,
506 .remove = __devexit_p(bcm63xx_cb_exit),506 .remove = bcm63xx_cb_exit,
507};507};
508#endif508#endif
509 509
drivers/pcmcia/bfin_cf_pcmcia.c+3−3
@@ -195,7 +195,7 @@ static struct pccard_operations bfin_cf_ops = { · 194 unmodified lines
195 195
196/*--------------------------------------------------------------------------*/196/*--------------------------------------------------------------------------*/
197 197
198static int __devinit bfin_cf_probe(struct platform_device *pdev)198static int bfin_cf_probe(struct platform_device *pdev)
199{199{
200 struct bfin_cf_socket *cf;200 struct bfin_cf_socket *cf;
201 struct resource *io_mem, *attr_mem;201 struct resource *io_mem, *attr_mem;
@@ -286,7 +286,7 @@ fail0: · 84 unmodified lines
286 return status;286 return status;
287}287}
288 288
289static int __devexit bfin_cf_remove(struct platform_device *pdev)289static int bfin_cf_remove(struct platform_device *pdev)
290{290{
291 struct bfin_cf_socket *cf = platform_get_drvdata(pdev);291 struct bfin_cf_socket *cf = platform_get_drvdata(pdev);
292 292
@@ -307,7 +307,7 @@ static struct platform_driver bfin_cf_driver = { · 14 unmodified lines
307 .owner = THIS_MODULE,307 .owner = THIS_MODULE,
308 },308 },
309 .probe = bfin_cf_probe,309 .probe = bfin_cf_probe,
310 .remove = __devexit_p(bfin_cf_remove),310 .remove = bfin_cf_remove,
311};311};
312 312
313module_platform_driver(bfin_cf_driver);313module_platform_driver(bfin_cf_driver);
drivers/pcmcia/db1xxx_ss.c+3−3
@@ -409,7 +409,7 @@ static struct pccard_operations db1x_pcmcia_operations = { · 408 unmodified lines
409 .set_mem_map = au1x00_pcmcia_set_mem_map,409 .set_mem_map = au1x00_pcmcia_set_mem_map,
410};410};
411 411
412static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)412static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
413{413{
414 struct db1x_pcmcia_sock *sock;414 struct db1x_pcmcia_sock *sock;
415 struct resource *r;415 struct resource *r;
@@ -559,7 +559,7 @@ out0: · 143 unmodified lines
559 return ret;559 return ret;
560}560}
561 561
562static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev)562static int db1x_pcmcia_socket_remove(struct platform_device *pdev)
563{563{
564 struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);564 struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);
565 565
@@ -577,7 +577,7 @@ static struct platform_driver db1x_pcmcia_socket_driver = { · 11 unmodified lines
577 .owner = THIS_MODULE,577 .owner = THIS_MODULE,
578 },578 },
579 .probe = db1x_pcmcia_socket_probe,579 .probe = db1x_pcmcia_socket_probe,
580 .remove = __devexit_p(db1x_pcmcia_socket_remove),580 .remove = db1x_pcmcia_socket_remove,
581};581};
582 582
583module_platform_driver(db1x_pcmcia_socket_driver);583module_platform_driver(db1x_pcmcia_socket_driver);
drivers/pcmcia/ds.c+1−12
@@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv) · 919 unmodified lines
920 return 0;920 return 0;
921}921}
922 922
923#ifdef CONFIG_HOTPLUG
924
925static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)923static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
926{924{
927 struct pcmcia_device *p_dev;925 struct pcmcia_device *p_dev;
@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) · 34 unmodified lines
962 return 0;960 return 0;
963}961}
964 962
965#else
966
967static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
968{
969 return -ENODEV;
970}
971
972#endif
973
974/************************ runtime PM support ***************************/963/************************ runtime PM support ***************************/
975 964
976static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);965static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);
@@ -1329,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = { · 352 unmodified lines
1329 .resume = pcmcia_bus_resume,1318 .resume = pcmcia_bus_resume,
1330};1319};
1331 1320
1332static int __devinit pcmcia_bus_add_socket(struct device *dev,1321static int pcmcia_bus_add_socket(struct device *dev,
1333 struct class_interface *class_intf)1322 struct class_interface *class_intf)
1334{1323{
1335 struct pcmcia_socket *socket = dev_get_drvdata(dev);1324 struct pcmcia_socket *socket = dev_get_drvdata(dev);
drivers/pcmcia/electra_cf.c+2−2
@@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = { · 180 unmodified lines
181 .set_mem_map = electra_cf_set_mem_map,181 .set_mem_map = electra_cf_set_mem_map,
182};182};
183 183
184static int __devinit electra_cf_probe(struct platform_device *ofdev)184static int electra_cf_probe(struct platform_device *ofdev)
185{185{
186 struct device *device = &ofdev->dev;186 struct device *device = &ofdev->dev;
187 struct device_node *np = ofdev->dev.of_node;187 struct device_node *np = ofdev->dev.of_node;
@@ -324,7 +324,7 @@ fail1: · 136 unmodified lines
324 324
325}325}
326 326
327static int __devexit electra_cf_remove(struct platform_device *ofdev)327static int electra_cf_remove(struct platform_device *ofdev)
328{328{
329 struct device *device = &ofdev->dev;329 struct device *device = &ofdev->dev;
330 struct electra_cf_socket *cf;330 struct electra_cf_socket *cf;
drivers/pcmcia/i82092.c+3−3
@@ -35,7 +35,7 @@ static struct pci_driver i82092aa_pci_driver = { · 34 unmodified lines
35 .name = "i82092aa",35 .name = "i82092aa",
36 .id_table = i82092aa_pci_ids,36 .id_table = i82092aa_pci_ids,
37 .probe = i82092aa_pci_probe,37 .probe = i82092aa_pci_probe,
38 .remove = __devexit_p(i82092aa_pci_remove),38 .remove = i82092aa_pci_remove,
39};39};
40 40
41 41
@@ -67,7 +67,7 @@ static struct socket_info sockets[MAX_SOCKETS]; · 25 unmodified lines
67static int socket_count; /* shortcut */ 67static int socket_count; /* shortcut */
68 68
69 69
70static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)70static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
71{71{
72 unsigned char configbyte;72 unsigned char configbyte;
73 int i, ret;73 int i, ret;
@@ -162,7 +162,7 @@ err_out_disable: · 88 unmodified lines
162 return ret; 162 return ret;
163}163}
164 164
165static void __devexit i82092aa_pci_remove(struct pci_dev *dev)165static void i82092aa_pci_remove(struct pci_dev *dev)
166{166{
167 struct pcmcia_socket *socket = pci_get_drvdata(dev);167 struct pcmcia_socket *socket = pci_get_drvdata(dev);
168 168
drivers/pcmcia/pd6729.c+4−4
@@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq) · 588 unmodified lines
589 return 0;589 return 0;
590}590}
591 591
592static u_int __devinit pd6729_isa_scan(void)592static u_int pd6729_isa_scan(void)
593{593{
594 u_int mask0, mask = 0;594 u_int mask0, mask = 0;
595 int i;595 int i;
@@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void) · 24 unmodified lines
620 return mask;620 return mask;
621}621}
622 622
623static int __devinit pd6729_pci_probe(struct pci_dev *dev,623static int pd6729_pci_probe(struct pci_dev *dev,
624 const struct pci_device_id *id)624 const struct pci_device_id *id)
625{625{
626 int i, j, ret;626 int i, j, ret;
@@ -739,7 +739,7 @@ err_out_free_mem: · 112 unmodified lines
739 return ret;739 return ret;
740}740}
741 741
742static void __devexit pd6729_pci_remove(struct pci_dev *dev)742static void pd6729_pci_remove(struct pci_dev *dev)
743{743{
744 int i;744 int i;
745 struct pd6729_socket *socket = pci_get_drvdata(dev);745 struct pd6729_socket *socket = pci_get_drvdata(dev);
@@ -772,7 +772,7 @@ static struct pci_driver pd6729_pci_driver = { · 26 unmodified lines
772 .name = "pd6729",772 .name = "pd6729",
773 .id_table = pd6729_pci_ids,773 .id_table = pd6729_pci_ids,
774 .probe = pd6729_pci_probe,774 .probe = pd6729_pci_probe,
775 .remove = __devexit_p(pd6729_pci_remove),775 .remove = pd6729_pci_remove,
776};776};
777 777
778static int pd6729_module_init(void)778static int pd6729_module_init(void)
drivers/pcmcia/pxa2xx_sharpsl.c+1−1
@@ -208,7 +208,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = { · 207 unmodified lines
208#ifdef CONFIG_SA1100_COLLIE208#ifdef CONFIG_SA1100_COLLIE
209#include "sa11xx_base.h"209#include "sa11xx_base.h"
210 210
211int __devinit pcmcia_collie_init(struct device *dev)211int pcmcia_collie_init(struct device *dev)
212{212{
213 int ret = -ENODEV;213 int ret = -ENODEV;
214 214
drivers/pcmcia/rsrc_nonstatic.c+3−3
@@ -1199,7 +1199,7 @@ static const struct attribute_group rsrc_attributes = { · 1198 unmodified lines
1199 .attrs = pccard_rsrc_attributes,1199 .attrs = pccard_rsrc_attributes,
1200};1200};
1201 1201
1202static int __devinit pccard_sysfs_add_rsrc(struct device *dev,1202static int pccard_sysfs_add_rsrc(struct device *dev,
1203 struct class_interface *class_intf)1203 struct class_interface *class_intf)
1204{1204{
1205 struct pcmcia_socket *s = dev_get_drvdata(dev);1205 struct pcmcia_socket *s = dev_get_drvdata(dev);
@@ -1209,7 +1209,7 @@ static int __devinit pccard_sysfs_add_rsrc(struct device *dev, · 3 unmodified lines
1209 return sysfs_create_group(&dev->kobj, &rsrc_attributes);1209 return sysfs_create_group(&dev->kobj, &rsrc_attributes);
1210}1210}
1211 1211
1212static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,1212static void pccard_sysfs_remove_rsrc(struct device *dev,
1213 struct class_interface *class_intf)1213 struct class_interface *class_intf)
1214{1214{
1215 struct pcmcia_socket *s = dev_get_drvdata(dev);1215 struct pcmcia_socket *s = dev_get_drvdata(dev);
@@ -1222,7 +1222,7 @@ static void __devexit pccard_sysfs_remove_rsrc(struct device *dev, · 6 unmodified lines
1222static struct class_interface pccard_rsrc_interface __refdata = {1222static struct class_interface pccard_rsrc_interface __refdata = {
1223 .class = &pcmcia_socket_class,1223 .class = &pcmcia_socket_class,
1224 .add_dev = &pccard_sysfs_add_rsrc,1224 .add_dev = &pccard_sysfs_add_rsrc,
1225 .remove_dev = __devexit_p(&pccard_sysfs_remove_rsrc),1225 .remove_dev = &pccard_sysfs_remove_rsrc,
1226};1226};
1227 1227
1228static int __init nonstatic_sysfs_init(void)1228static int __init nonstatic_sysfs_init(void)
drivers/pcmcia/sa1100_assabet.c+1−1
@@ -95,7 +95,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = { · 94 unmodified lines
95 .socket_suspend = assabet_pcmcia_socket_suspend,95 .socket_suspend = assabet_pcmcia_socket_suspend,
96};96};
97 97
98int __devinit pcmcia_assabet_init(struct device *dev)98int pcmcia_assabet_init(struct device *dev)
99{99{
100 int ret = -ENODEV;100 int ret = -ENODEV;
101 101
drivers/pcmcia/sa1100_cerf.c+1−1
@@ -81,7 +81,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = { · 80 unmodified lines
81 .configure_socket = cerf_pcmcia_configure_socket,81 .configure_socket = cerf_pcmcia_configure_socket,
82};82};
83 83
84int __devinit pcmcia_cerf_init(struct device *dev)84int pcmcia_cerf_init(struct device *dev)
85{85{
86 int ret = -ENODEV;86 int ret = -ENODEV;
87 87
drivers/pcmcia/sa1100_generic.c+2−2
@@ -43,7 +43,7 @@ · 42 unmodified lines
43 43
44int __init pcmcia_collie_init(struct device *dev);44int __init pcmcia_collie_init(struct device *dev);
45 45
46static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {46static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
47#ifdef CONFIG_SA1100_ASSABET47#ifdef CONFIG_SA1100_ASSABET
48 pcmcia_assabet_init,48 pcmcia_assabet_init,
49#endif49#endif
@@ -67,7 +67,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = { · 17 unmodified lines
67#endif67#endif
68};68};
69 69
70static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev)70static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
71{71{
72 int i, ret = -ENODEV;72 int i, ret = -ENODEV;
73 73
drivers/pcmcia/sa1100_h3600.c+1−1
@@ -153,7 +153,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { · 152 unmodified lines
153 .socket_suspend = h3600_pcmcia_socket_suspend,153 .socket_suspend = h3600_pcmcia_socket_suspend,
154};154};
155 155
156int __devinit pcmcia_h3600_init(struct device *dev)156int pcmcia_h3600_init(struct device *dev)
157{157{
158 int ret = -ENODEV;158 int ret = -ENODEV;
159 159
drivers/pcmcia/sa1100_shannon.c+1−1
@@ -92,7 +92,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = { · 91 unmodified lines
92 .configure_socket = shannon_pcmcia_configure_socket,92 .configure_socket = shannon_pcmcia_configure_socket,
93};93};
94 94
95int __devinit pcmcia_shannon_init(struct device *dev)95int pcmcia_shannon_init(struct device *dev)
96{96{
97 int ret = -ENODEV;97 int ret = -ENODEV;
98 98
drivers/pcmcia/sa1100_simpad.c+1−1
@@ -109,7 +109,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = { · 108 unmodified lines
109 .socket_suspend = simpad_pcmcia_socket_suspend,109 .socket_suspend = simpad_pcmcia_socket_suspend,
110};110};
111 111
112int __devinit pcmcia_simpad_init(struct device *dev)112int pcmcia_simpad_init(struct device *dev)
113{113{
114 int ret = -ENODEV;114 int ret = -ENODEV;
115 115
drivers/pcmcia/sa1111_generic.c+2−2
@@ -211,7 +211,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) · 210 unmodified lines
211 return 0;211 return 0;
212}212}
213 213
214static int __devexit pcmcia_remove(struct sa1111_dev *dev)214static int pcmcia_remove(struct sa1111_dev *dev)
215{215{
216 struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);216 struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
217 217
@@ -234,7 +234,7 @@ static struct sa1111_driver pcmcia_driver = { · 16 unmodified lines
234 },234 },
235 .devid = SA1111_DEVID_PCMCIA,235 .devid = SA1111_DEVID_PCMCIA,
236 .probe = pcmcia_probe,236 .probe = pcmcia_probe,
237 .remove = __devexit_p(pcmcia_remove),237 .remove = pcmcia_remove,
238};238};
239 239
240static int __init sa1111_drv_pcmcia_init(void)240static int __init sa1111_drv_pcmcia_init(void)
drivers/pcmcia/sa1111_jornada720.c+1−1
@@ -91,7 +91,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { · 90 unmodified lines
91 .nr = 2,91 .nr = 2,
92};92};
93 93
94int __devinit pcmcia_jornada720_init(struct device *dev)94int pcmcia_jornada720_init(struct device *dev)
95{95{
96 int ret = -ENODEV;96 int ret = -ENODEV;
97 97
drivers/pcmcia/vrc4171_card.c+4−4
@@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot) · 563 unmodified lines
564 vrc4171_irq_mask &= ~(1 << irq);564 vrc4171_irq_mask &= ~(1 << irq);
565}565}
566 566
567static int __devinit vrc4171_add_sockets(void)567static int vrc4171_add_sockets(void)
568{568{
569 vrc4171_socket_t *socket;569 vrc4171_socket_t *socket;
570 int slot, retval;570 int slot, retval;
@@ -631,7 +631,7 @@ static void vrc4171_remove_sockets(void) · 60 unmodified lines
631 }631 }
632}632}
633 633
634static int __devinit vrc4171_card_setup(char *options)634static int vrc4171_card_setup(char *options)
635{635{
636 if (options == NULL || *options == '\0')636 if (options == NULL || *options == '\0')
637 return 1;637 return 1;
@@ -712,7 +712,7 @@ static struct platform_driver vrc4171_card_driver = { · 74 unmodified lines
712 },712 },
713};713};
714 714
715static int __devinit vrc4171_card_init(void)715static int vrc4171_card_init(void)
716{716{
717 int retval;717 int retval;
718 718
@@ -746,7 +746,7 @@ static int __devinit vrc4171_card_init(void) · 27 unmodified lines
746 return 0;746 return 0;
747}747}
748 748
749static void __devexit vrc4171_card_exit(void)749static void vrc4171_card_exit(void)
750{750{
751 free_irq(vrc4171_irq, vrc4171_sockets);751 free_irq(vrc4171_irq, vrc4171_sockets);
752 vrc4171_remove_sockets();752 vrc4171_remove_sockets();
drivers/pcmcia/vrc4173_cardu.c+4−4
@@ -456,7 +456,7 @@ static void cardu_interrupt(int irq, void *dev_id) · 455 unmodified lines
456 }456 }
457}457}
458 458
459static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,459static int vrc4173_cardu_probe(struct pci_dev *dev,
460 const struct pci_device_id *ent)460 const struct pci_device_id *ent)
461{461{
462 vrc4173_socket_t *socket;462 vrc4173_socket_t *socket;
@@ -533,7 +533,7 @@ disable: · 70 unmodified lines
533 return ret;533 return ret;
534}534}
535 535
536static int __devinit vrc4173_cardu_setup(char *options)536static int vrc4173_cardu_setup(char *options)
537{537{
538 if (options == NULL || *options == '\0')538 if (options == NULL || *options == '\0')
539 return 1;539 return 1;
@@ -574,14 +574,14 @@ static struct pci_driver vrc4173_cardu_driver = { · 34 unmodified lines
574 .id_table = vrc4173_cardu_id_table,574 .id_table = vrc4173_cardu_id_table,
575};575};
576 576
577static int __devinit vrc4173_cardu_init(void)577static int vrc4173_cardu_init(void)
578{578{
579 vrc4173_cardu_slots = 0;579 vrc4173_cardu_slots = 0;
580 580
581 return pci_register_driver(&vrc4173_cardu_driver);581 return pci_register_driver(&vrc4173_cardu_driver);
582}582}
583 583
584static void __devexit vrc4173_cardu_exit(void)584static void vrc4173_cardu_exit(void)
585{585{
586 pci_unregister_driver(&vrc4173_cardu_driver);586 pci_unregister_driver(&vrc4173_cardu_driver);
587}587}
drivers/pcmcia/xxs1500_ss.c+3−3
@@ -204,7 +204,7 @@ static struct pccard_operations xxs1500_pcmcia_operations = { · 203 unmodified lines
204 .set_mem_map = au1x00_pcmcia_set_mem_map,204 .set_mem_map = au1x00_pcmcia_set_mem_map,
205};205};
206 206
207static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)207static int xxs1500_pcmcia_probe(struct platform_device *pdev)
208{208{
209 struct xxs1500_pcmcia_sock *sock;209 struct xxs1500_pcmcia_sock *sock;
210 struct resource *r;210 struct resource *r;
@@ -299,7 +299,7 @@ out0: · 88 unmodified lines
299 return ret;299 return ret;
300}300}
301 301
302static int __devexit xxs1500_pcmcia_remove(struct platform_device *pdev)302static int xxs1500_pcmcia_remove(struct platform_device *pdev)
303{303{
304 struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);304 struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
305 305
@@ -317,7 +317,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = { · 11 unmodified lines
317 .owner = THIS_MODULE,317 .owner = THIS_MODULE,
318 },318 },
319 .probe = xxs1500_pcmcia_probe,319 .probe = xxs1500_pcmcia_probe,
320 .remove = __devexit_p(xxs1500_pcmcia_remove),320 .remove = xxs1500_pcmcia_remove,
321};321};
322 322
323module_platform_driver(xxs1500_pcmcia_socket_driver);323module_platform_driver(xxs1500_pcmcia_socket_driver);
drivers/pcmcia/yenta_socket.c+3−3
@@ -783,7 +783,7 @@ static void yenta_free_resources(struct yenta_socket *socket) · 782 unmodified lines
783/*783/*
784 * Close it down - release our resources and go home..784 * Close it down - release our resources and go home..
785 */785 */
786static void __devexit yenta_close(struct pci_dev *dev)786static void yenta_close(struct pci_dev *dev)
787{787{
788 struct yenta_socket *sock = pci_get_drvdata(dev);788 struct yenta_socket *sock = pci_get_drvdata(dev);
789 789
@@ -1142,7 +1142,7 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) · 352 unmodified lines
1142 * interrupt, and that we can map the cardbus area. Fill in the1142 * interrupt, and that we can map the cardbus area. Fill in the
1143 * socket information structure..1143 * socket information structure..
1144 */1144 */
1145static int __devinit yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)1145static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
1146{1146{
1147 struct yenta_socket *socket;1147 struct yenta_socket *socket;
1148 int ret;1148 int ret;
@@ -1435,7 +1435,7 @@ static struct pci_driver yenta_cardbus_driver = { · 286 unmodified lines
1435 .name = "yenta_cardbus",1435 .name = "yenta_cardbus",
1436 .id_table = yenta_table,1436 .id_table = yenta_table,
1437 .probe = yenta_probe,1437 .probe = yenta_probe,
1438 .remove = __devexit_p(yenta_close),1438 .remove = yenta_close,
1439 .driver.pm = YENTA_PM_OPS,1439 .driver.pm = YENTA_PM_OPS,
1440};1440};
1441 1441
drivers/pinctrl/pinctrl-bcm2835.c+4−4
@@ -372,7 +372,7 @@ static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset) · 371 unmodified lines
372 return irq_linear_revmap(pc->irq_domain, offset);372 return irq_linear_revmap(pc->irq_domain, offset);
373}373}
374 374
375static struct gpio_chip bcm2835_gpio_chip __devinitconst = {375static struct gpio_chip bcm2835_gpio_chip = {
376 .label = MODULE_NAME,376 .label = MODULE_NAME,
377 .owner = THIS_MODULE,377 .owner = THIS_MODULE,
378 .request = bcm2835_gpio_request,378 .request = bcm2835_gpio_request,
@@ -931,7 +931,7 @@ static struct pinctrl_desc bcm2835_pinctrl_desc = { · 552 unmodified lines
931 .owner = THIS_MODULE,931 .owner = THIS_MODULE,
932};932};
933 933
934static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range __devinitconst = {934static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range = {
935 .name = MODULE_NAME,935 .name = MODULE_NAME,
936 .npins = BCM2835_NUM_GPIOS,936 .npins = BCM2835_NUM_GPIOS,
937};937};
@@ -1042,7 +1042,7 @@ static int __devinit bcm2835_pinctrl_probe(struct platform_device *pdev) · 104 unmodified lines
1042 return 0;1042 return 0;
1043}1043}
1044 1044
1045static int __devexit bcm2835_pinctrl_remove(struct platform_device *pdev)1045static int bcm2835_pinctrl_remove(struct platform_device *pdev)
1046{1046{
1047 struct bcm2835_pinctrl *pc = platform_get_drvdata(pdev);1047 struct bcm2835_pinctrl *pc = platform_get_drvdata(pdev);
1048 1048
@@ -1052,7 +1052,7 @@ static int __devexit bcm2835_pinctrl_remove(struct platform_device *pdev) · 3 unmodified lines
1052 return 0;1052 return 0;
1053}1053}
1054 1054
1055static struct of_device_id bcm2835_pinctrl_match[] __devinitconst = {1055static struct of_device_id bcm2835_pinctrl_match[] = {
1056 { .compatible = "brcm,bcm2835-gpio" },1056 { .compatible = "brcm,bcm2835-gpio" },
1057 {}1057 {}
1058};1058};
drivers/pinctrl/pinctrl-imx.c+1−1
@@ -611,7 +611,7 @@ int __devinit imx_pinctrl_probe(struct platform_device *pdev, · 610 unmodified lines
611 return 0;611 return 0;
612}612}
613 613
614int __devexit imx_pinctrl_remove(struct platform_device *pdev)614int imx_pinctrl_remove(struct platform_device *pdev)
615{615{
616 struct imx_pinctrl *ipctl = platform_get_drvdata(pdev);616 struct imx_pinctrl *ipctl = platform_get_drvdata(pdev);
617 617
drivers/pinctrl/pinctrl-imx23.c+2−2
@@ -272,7 +272,7 @@ static int __devinit imx23_pinctrl_probe(struct platform_device *pdev) · 271 unmodified lines
272 return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data);272 return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data);
273}273}
274 274
275static struct of_device_id imx23_pinctrl_of_match[] __devinitdata = {275static struct of_device_id imx23_pinctrl_of_match[] = {
276 { .compatible = "fsl,imx23-pinctrl", },276 { .compatible = "fsl,imx23-pinctrl", },
277 { /* sentinel */ }277 { /* sentinel */ }
278};278};
@@ -285,7 +285,7 @@ static struct platform_driver imx23_pinctrl_driver = { · 6 unmodified lines
285 .of_match_table = imx23_pinctrl_of_match,285 .of_match_table = imx23_pinctrl_of_match,
286 },286 },
287 .probe = imx23_pinctrl_probe,287 .probe = imx23_pinctrl_probe,
288 .remove = __devexit_p(mxs_pinctrl_remove),288 .remove = mxs_pinctrl_remove,
289};289};
290 290
291static int __init imx23_pinctrl_init(void)291static int __init imx23_pinctrl_init(void)
drivers/pinctrl/pinctrl-imx28.c+2−2
@@ -388,7 +388,7 @@ static int __devinit imx28_pinctrl_probe(struct platform_device *pdev) · 387 unmodified lines
388 return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data);388 return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data);
389}389}
390 390
391static struct of_device_id imx28_pinctrl_of_match[] __devinitdata = {391static struct of_device_id imx28_pinctrl_of_match[] = {
392 { .compatible = "fsl,imx28-pinctrl", },392 { .compatible = "fsl,imx28-pinctrl", },
393 { /* sentinel */ }393 { /* sentinel */ }
394};394};
@@ -401,7 +401,7 @@ static struct platform_driver imx28_pinctrl_driver = { · 6 unmodified lines
401 .of_match_table = imx28_pinctrl_of_match,401 .of_match_table = imx28_pinctrl_of_match,
402 },402 },
403 .probe = imx28_pinctrl_probe,403 .probe = imx28_pinctrl_probe,
404 .remove = __devexit_p(mxs_pinctrl_remove),404 .remove = mxs_pinctrl_remove,
405};405};
406 406
407static int __init imx28_pinctrl_init(void)407static int __init imx28_pinctrl_init(void)
drivers/pinctrl/pinctrl-imx35.c+2−2
@@ -1559,7 +1559,7 @@ static struct imx_pinctrl_soc_info imx35_pinctrl_info = { · 1558 unmodified lines
1559 .npin_regs = ARRAY_SIZE(imx35_pin_regs),1559 .npin_regs = ARRAY_SIZE(imx35_pin_regs),
1560};1560};
1561 1561
1562static struct of_device_id imx35_pinctrl_of_match[] __devinitdata = {1562static struct of_device_id imx35_pinctrl_of_match[] = {
1563 { .compatible = "fsl,imx35-iomuxc", },1563 { .compatible = "fsl,imx35-iomuxc", },
1564 { /* sentinel */ }1564 { /* sentinel */ }
1565};1565};
@@ -1576,7 +1576,7 @@ static struct platform_driver imx35_pinctrl_driver = { · 10 unmodified lines
1576 .of_match_table = of_match_ptr(imx35_pinctrl_of_match),1576 .of_match_table = of_match_ptr(imx35_pinctrl_of_match),
1577 },1577 },
1578 .probe = imx35_pinctrl_probe,1578 .probe = imx35_pinctrl_probe,
1579 .remove = __devexit_p(imx_pinctrl_remove),1579 .remove = imx_pinctrl_remove,
1580};1580};
1581 1581
1582static int __init imx35_pinctrl_init(void)1582static int __init imx35_pinctrl_init(void)
drivers/pinctrl/pinctrl-imx51.c+2−2
@@ -1286,7 +1286,7 @@ static struct imx_pinctrl_soc_info imx51_pinctrl_info = { · 1285 unmodified lines
1286 .npin_regs = ARRAY_SIZE(imx51_pin_regs),1286 .npin_regs = ARRAY_SIZE(imx51_pin_regs),
1287};1287};
1288 1288
1289static struct of_device_id imx51_pinctrl_of_match[] __devinitdata = {1289static struct of_device_id imx51_pinctrl_of_match[] = {
1290 { .compatible = "fsl,imx51-iomuxc", },1290 { .compatible = "fsl,imx51-iomuxc", },
1291 { /* sentinel */ }1291 { /* sentinel */ }
1292};1292};
@@ -1303,7 +1303,7 @@ static struct platform_driver imx51_pinctrl_driver = { · 10 unmodified lines
1303 .of_match_table = of_match_ptr(imx51_pinctrl_of_match),1303 .of_match_table = of_match_ptr(imx51_pinctrl_of_match),
1304 },1304 },
1305 .probe = imx51_pinctrl_probe,1305 .probe = imx51_pinctrl_probe,
1306 .remove = __devexit_p(imx_pinctrl_remove),1306 .remove = imx_pinctrl_remove,
1307};1307};
1308 1308
1309static int __init imx51_pinctrl_init(void)1309static int __init imx51_pinctrl_init(void)
drivers/pinctrl/pinctrl-imx53.c+2−2
@@ -1613,7 +1613,7 @@ static struct imx_pinctrl_soc_info imx53_pinctrl_info = { · 1612 unmodified lines
1613 .npin_regs = ARRAY_SIZE(imx53_pin_regs),1613 .npin_regs = ARRAY_SIZE(imx53_pin_regs),
1614};1614};
1615 1615
1616static struct of_device_id imx53_pinctrl_of_match[] __devinitdata = {1616static struct of_device_id imx53_pinctrl_of_match[] = {
1617 { .compatible = "fsl,imx53-iomuxc", },1617 { .compatible = "fsl,imx53-iomuxc", },
1618 { /* sentinel */ }1618 { /* sentinel */ }
1619};1619};
@@ -1630,7 +1630,7 @@ static struct platform_driver imx53_pinctrl_driver = { · 10 unmodified lines
1630 .of_match_table = of_match_ptr(imx53_pinctrl_of_match),1630 .of_match_table = of_match_ptr(imx53_pinctrl_of_match),
1631 },1631 },
1632 .probe = imx53_pinctrl_probe,1632 .probe = imx53_pinctrl_probe,
1633 .remove = __devexit_p(imx_pinctrl_remove),1633 .remove = imx_pinctrl_remove,
1634};1634};
1635 1635
1636static int __init imx53_pinctrl_init(void)1636static int __init imx53_pinctrl_init(void)
drivers/pinctrl/pinctrl-imx6q.c+2−2
@@ -2297,7 +2297,7 @@ static struct imx_pinctrl_soc_info imx6q_pinctrl_info = { · 2296 unmodified lines
2297 .npin_regs = ARRAY_SIZE(imx6q_pin_regs),2297 .npin_regs = ARRAY_SIZE(imx6q_pin_regs),
2298};2298};
2299 2299
2300static struct of_device_id imx6q_pinctrl_of_match[] __devinitdata = {2300static struct of_device_id imx6q_pinctrl_of_match[] = {
2301 { .compatible = "fsl,imx6q-iomuxc", },2301 { .compatible = "fsl,imx6q-iomuxc", },
2302 { /* sentinel */ }2302 { /* sentinel */ }
2303};2303};
@@ -2314,7 +2314,7 @@ static struct platform_driver imx6q_pinctrl_driver = { · 10 unmodified lines
2314 .of_match_table = of_match_ptr(imx6q_pinctrl_of_match),2314 .of_match_table = of_match_ptr(imx6q_pinctrl_of_match),
2315 },2315 },
2316 .probe = imx6q_pinctrl_probe,2316 .probe = imx6q_pinctrl_probe,
2317 .remove = __devexit_p(imx_pinctrl_remove),2317 .remove = imx_pinctrl_remove,
2318};2318};
2319 2319
2320static int __init imx6q_pinctrl_init(void)2320static int __init imx6q_pinctrl_init(void)
drivers/pinctrl/pinctrl-mmp2.c+2−2
@@ -691,7 +691,7 @@ static int __devinit mmp2_pinmux_probe(struct platform_device *pdev) · 690 unmodified lines
691 return pxa3xx_pinctrl_register(pdev, &mmp2_info);691 return pxa3xx_pinctrl_register(pdev, &mmp2_info);
692}692}
693 693
694static int __devexit mmp2_pinmux_remove(struct platform_device *pdev)694static int mmp2_pinmux_remove(struct platform_device *pdev)
695{695{
696 return pxa3xx_pinctrl_unregister(pdev);696 return pxa3xx_pinctrl_unregister(pdev);
697}697}
@@ -702,7 +702,7 @@ static struct platform_driver mmp2_pinmux_driver = { · 4 unmodified lines
702 .owner = THIS_MODULE,702 .owner = THIS_MODULE,
703 },703 },
704 .probe = mmp2_pinmux_probe,704 .probe = mmp2_pinmux_probe,
705 .remove = __devexit_p(mmp2_pinmux_remove),705 .remove = mmp2_pinmux_remove,
706};706};
707 707
708static int __init mmp2_pinmux_init(void)708static int __init mmp2_pinmux_init(void)
drivers/pinctrl/pinctrl-mxs.c+1−1
@@ -522,7 +522,7 @@ err: · 521 unmodified lines
522}522}
523EXPORT_SYMBOL_GPL(mxs_pinctrl_probe);523EXPORT_SYMBOL_GPL(mxs_pinctrl_probe);
524 524
525int __devexit mxs_pinctrl_remove(struct platform_device *pdev)525int mxs_pinctrl_remove(struct platform_device *pdev)
526{526{
527 struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);527 struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
528 528
drivers/pinctrl/pinctrl-pxa168.c+2−2
@@ -620,7 +620,7 @@ static int __devinit pxa168_pinmux_probe(struct platform_device *pdev) · 619 unmodified lines
620 return pxa3xx_pinctrl_register(pdev, &pxa168_info);620 return pxa3xx_pinctrl_register(pdev, &pxa168_info);
621}621}
622 622
623static int __devexit pxa168_pinmux_remove(struct platform_device *pdev)623static int pxa168_pinmux_remove(struct platform_device *pdev)
624{624{
625 return pxa3xx_pinctrl_unregister(pdev);625 return pxa3xx_pinctrl_unregister(pdev);
626}626}
@@ -631,7 +631,7 @@ static struct platform_driver pxa168_pinmux_driver = { · 4 unmodified lines
631 .owner = THIS_MODULE,631 .owner = THIS_MODULE,
632 },632 },
633 .probe = pxa168_pinmux_probe,633 .probe = pxa168_pinmux_probe,
634 .remove = __devexit_p(pxa168_pinmux_remove),634 .remove = pxa168_pinmux_remove,
635};635};
636 636
637static int __init pxa168_pinmux_init(void)637static int __init pxa168_pinmux_init(void)
drivers/pinctrl/pinctrl-pxa910.c+2−2
@@ -976,7 +976,7 @@ static int __devinit pxa910_pinmux_probe(struct platform_device *pdev) · 975 unmodified lines
976 return pxa3xx_pinctrl_register(pdev, &pxa910_info);976 return pxa3xx_pinctrl_register(pdev, &pxa910_info);
977}977}
978 978
979static int __devexit pxa910_pinmux_remove(struct platform_device *pdev)979static int pxa910_pinmux_remove(struct platform_device *pdev)
980{980{
981 return pxa3xx_pinctrl_unregister(pdev);981 return pxa3xx_pinctrl_unregister(pdev);
982}982}
@@ -987,7 +987,7 @@ static struct platform_driver pxa910_pinmux_driver = { · 4 unmodified lines
987 .owner = THIS_MODULE,987 .owner = THIS_MODULE,
988 },988 },
989 .probe = pxa910_pinmux_probe,989 .probe = pxa910_pinmux_probe,
990 .remove = __devexit_p(pxa910_pinmux_remove),990 .remove = pxa910_pinmux_remove,
991};991};
992 992
993static int __init pxa910_pinmux_init(void)993static int __init pxa910_pinmux_init(void)
drivers/pinctrl/pinctrl-single.c+3−3
@@ -1062,7 +1062,7 @@ free: · 1061 unmodified lines
1062 return ret;1062 return ret;
1063}1063}
1064 1064
1065static int __devexit pcs_remove(struct platform_device *pdev)1065static int pcs_remove(struct platform_device *pdev)
1066{1066{
1067 struct pcs_device *pcs = platform_get_drvdata(pdev);1067 struct pcs_device *pcs = platform_get_drvdata(pdev);
1068 1068
@@ -1074,7 +1074,7 @@ static int __devexit pcs_remove(struct platform_device *pdev) · 5 unmodified lines
1074 return 0;1074 return 0;
1075}1075}
1076 1076
1077static struct of_device_id pcs_of_match[] __devinitdata = {1077static struct of_device_id pcs_of_match[] = {
1078 { .compatible = DRIVER_NAME, },1078 { .compatible = DRIVER_NAME, },
1079 { },1079 { },
1080};1080};
@@ -1082,7 +1082,7 @@ MODULE_DEVICE_TABLE(of, pcs_of_match); · 1 unmodified line
1082 1082
1083static struct platform_driver pcs_driver = {1083static struct platform_driver pcs_driver = {
1084 .probe = pcs_probe,1084 .probe = pcs_probe,
1085 .remove = __devexit_p(pcs_remove),1085 .remove = pcs_remove,
1086 .driver = {1086 .driver = {
1087 .owner = THIS_MODULE,1087 .owner = THIS_MODULE,
1088 .name = DRIVER_NAME,1088 .name = DRIVER_NAME,
drivers/pinctrl/pinctrl-sirf.c+1−1
@@ -1305,7 +1305,7 @@ out_no_gpio_remap: · 1304 unmodified lines
1305 return ret;1305 return ret;
1306}1306}
1307 1307
1308static const struct of_device_id pinmux_ids[] __devinitconst = {1308static const struct of_device_id pinmux_ids[] = {
1309 { .compatible = "sirf,prima2-pinctrl" },1309 { .compatible = "sirf,prima2-pinctrl" },
1310 { .compatible = "sirf,marco-pinctrl" },1310 { .compatible = "sirf,marco-pinctrl" },
1311 {}1311 {}
drivers/pinctrl/pinctrl-tegra.c+1−1
@@ -760,7 +760,7 @@ int __devinit tegra_pinctrl_probe(struct platform_device *pdev, · 759 unmodified lines
760}760}
761EXPORT_SYMBOL_GPL(tegra_pinctrl_probe);761EXPORT_SYMBOL_GPL(tegra_pinctrl_probe);
762 762
763int __devexit tegra_pinctrl_remove(struct platform_device *pdev)763int tegra_pinctrl_remove(struct platform_device *pdev)
764{764{
765 struct tegra_pmx *pmx = platform_get_drvdata(pdev);765 struct tegra_pmx *pmx = platform_get_drvdata(pdev);
766 766
drivers/pinctrl/pinctrl-tegra20.c+2−2
@@ -2861,7 +2861,7 @@ static int __devinit tegra20_pinctrl_probe(struct platform_device *pdev) · 2860 unmodified lines
2861 return tegra_pinctrl_probe(pdev, &tegra20_pinctrl);2861 return tegra_pinctrl_probe(pdev, &tegra20_pinctrl);
2862}2862}
2863 2863
2864static struct of_device_id tegra20_pinctrl_of_match[] __devinitdata = {2864static struct of_device_id tegra20_pinctrl_of_match[] = {
2865 { .compatible = "nvidia,tegra20-pinmux", },2865 { .compatible = "nvidia,tegra20-pinmux", },
2866 { },2866 { },
2867};2867};
@@ -2873,7 +2873,7 @@ static struct platform_driver tegra20_pinctrl_driver = { · 5 unmodified lines
2873 .of_match_table = tegra20_pinctrl_of_match,2873 .of_match_table = tegra20_pinctrl_of_match,
2874 },2874 },
2875 .probe = tegra20_pinctrl_probe,2875 .probe = tegra20_pinctrl_probe,
2876 .remove = __devexit_p(tegra_pinctrl_remove),2876 .remove = tegra_pinctrl_remove,
2877};2877};
2878 2878
2879static int __init tegra20_pinctrl_init(void)2879static int __init tegra20_pinctrl_init(void)
drivers/pinctrl/pinctrl-tegra30.c+2−2
@@ -3727,7 +3727,7 @@ static int __devinit tegra30_pinctrl_probe(struct platform_device *pdev) · 3726 unmodified lines
3727 return tegra_pinctrl_probe(pdev, &tegra30_pinctrl);3727 return tegra_pinctrl_probe(pdev, &tegra30_pinctrl);
3728}3728}
3729 3729
3730static struct of_device_id tegra30_pinctrl_of_match[] __devinitdata = {3730static struct of_device_id tegra30_pinctrl_of_match[] = {
3731 { .compatible = "nvidia,tegra30-pinmux", },3731 { .compatible = "nvidia,tegra30-pinmux", },
3732 { },3732 { },
3733};3733};
@@ -3739,7 +3739,7 @@ static struct platform_driver tegra30_pinctrl_driver = { · 5 unmodified lines
3739 .of_match_table = tegra30_pinctrl_of_match,3739 .of_match_table = tegra30_pinctrl_of_match,
3740 },3740 },
3741 .probe = tegra30_pinctrl_probe,3741 .probe = tegra30_pinctrl_probe,
3742 .remove = __devexit_p(tegra_pinctrl_remove),3742 .remove = tegra_pinctrl_remove,
3743};3743};
3744 3744
3745static int __init tegra30_pinctrl_init(void)3745static int __init tegra30_pinctrl_init(void)
drivers/pinctrl/pinctrl-u300.c+2−2
@@ -1095,7 +1095,7 @@ static int __devinit u300_pmx_probe(struct platform_device *pdev) · 1094 unmodified lines
1095 return 0;1095 return 0;
1096}1096}
1097 1097
1098static int __devexit u300_pmx_remove(struct platform_device *pdev)1098static int u300_pmx_remove(struct platform_device *pdev)
1099{1099{
1100 struct u300_pmx *upmx = platform_get_drvdata(pdev);1100 struct u300_pmx *upmx = platform_get_drvdata(pdev);
1101 1101
@@ -1111,7 +1111,7 @@ static struct platform_driver u300_pmx_driver = { · 9 unmodified lines
1111 .owner = THIS_MODULE,1111 .owner = THIS_MODULE,
1112 },1112 },
1113 .probe = u300_pmx_probe,1113 .probe = u300_pmx_probe,
1114 .remove = __devexit_p(u300_pmx_remove),1114 .remove = u300_pmx_remove,
1115};1115};
1116 1116
1117static int __init u300_pmx_init(void)1117static int __init u300_pmx_init(void)
drivers/pinctrl/spear/pinctrl-spear.c+1−1
@@ -417,7 +417,7 @@ int __devinit spear_pinctrl_probe(struct platform_device *pdev, · 416 unmodified lines
417 return 0;417 return 0;
418}418}
419 419
420int __devexit spear_pinctrl_remove(struct platform_device *pdev)420int spear_pinctrl_remove(struct platform_device *pdev)
421{421{
422 struct spear_pmx *pmx = platform_get_drvdata(pdev);422 struct spear_pmx *pmx = platform_get_drvdata(pdev);
423 423
drivers/pinctrl/spear/pinctrl-spear.h+1−1
@@ -198,7 +198,7 @@ pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, · 197 unmodified lines
198 unsigned count, u16 reg);198 unsigned count, u16 reg);
199int __devinit spear_pinctrl_probe(struct platform_device *pdev,199int __devinit spear_pinctrl_probe(struct platform_device *pdev,
200 struct spear_pinctrl_machdata *machdata);200 struct spear_pinctrl_machdata *machdata);
201int __devexit spear_pinctrl_remove(struct platform_device *pdev);201int spear_pinctrl_remove(struct platform_device *pdev);
202 202
203#define SPEAR_PIN_0_TO_101 \203#define SPEAR_PIN_0_TO_101 \
204 PINCTRL_PIN(0, "PLGPIO0"), \204 PINCTRL_PIN(0, "PLGPIO0"), \
drivers/pinctrl/spear/pinctrl-spear1310.c+3−3
@@ -2692,7 +2692,7 @@ static struct spear_pinctrl_machdata spear1310_machdata = { · 2691 unmodified lines
2692 .modes_supported = false,2692 .modes_supported = false,
2693};2693};
2694 2694
2695static struct of_device_id spear1310_pinctrl_of_match[] __devinitdata = {2695static struct of_device_id spear1310_pinctrl_of_match[] = {
2696 {2696 {
2697 .compatible = "st,spear1310-pinmux",2697 .compatible = "st,spear1310-pinmux",
2698 },2698 },
@@ -2704,7 +2704,7 @@ static int __devinit spear1310_pinctrl_probe(struct platform_device *pdev) · 5 unmodified lines
2704 return spear_pinctrl_probe(pdev, &spear1310_machdata);2704 return spear_pinctrl_probe(pdev, &spear1310_machdata);
2705}2705}
2706 2706
2707static int __devexit spear1310_pinctrl_remove(struct platform_device *pdev)2707static int spear1310_pinctrl_remove(struct platform_device *pdev)
2708{2708{
2709 return spear_pinctrl_remove(pdev);2709 return spear_pinctrl_remove(pdev);
2710}2710}
@@ -2716,7 +2716,7 @@ static struct platform_driver spear1310_pinctrl_driver = { · 5 unmodified lines
2716 .of_match_table = spear1310_pinctrl_of_match,2716 .of_match_table = spear1310_pinctrl_of_match,
2717 },2717 },
2718 .probe = spear1310_pinctrl_probe,2718 .probe = spear1310_pinctrl_probe,
2719 .remove = __devexit_p(spear1310_pinctrl_remove),2719 .remove = spear1310_pinctrl_remove,
2720};2720};
2721 2721
2722static int __init spear1310_pinctrl_init(void)2722static int __init spear1310_pinctrl_init(void)
drivers/pinctrl/spear/pinctrl-spear1340.c+3−3
@@ -2008,7 +2008,7 @@ static struct spear_pinctrl_machdata spear1340_machdata = { · 2007 unmodified lines
2008 .modes_supported = false,2008 .modes_supported = false,
2009};2009};
2010 2010
2011static struct of_device_id spear1340_pinctrl_of_match[] __devinitdata = {2011static struct of_device_id spear1340_pinctrl_of_match[] = {
2012 {2012 {
2013 .compatible = "st,spear1340-pinmux",2013 .compatible = "st,spear1340-pinmux",
2014 },2014 },
@@ -2020,7 +2020,7 @@ static int __devinit spear1340_pinctrl_probe(struct platform_device *pdev) · 5 unmodified lines
2020 return spear_pinctrl_probe(pdev, &spear1340_machdata);2020 return spear_pinctrl_probe(pdev, &spear1340_machdata);
2021}2021}
2022 2022
2023static int __devexit spear1340_pinctrl_remove(struct platform_device *pdev)2023static int spear1340_pinctrl_remove(struct platform_device *pdev)
2024{2024{
2025 return spear_pinctrl_remove(pdev);2025 return spear_pinctrl_remove(pdev);
2026}2026}
@@ -2032,7 +2032,7 @@ static struct platform_driver spear1340_pinctrl_driver = { · 5 unmodified lines
2032 .of_match_table = spear1340_pinctrl_of_match,2032 .of_match_table = spear1340_pinctrl_of_match,
2033 },2033 },
2034 .probe = spear1340_pinctrl_probe,2034 .probe = spear1340_pinctrl_probe,
2035 .remove = __devexit_p(spear1340_pinctrl_remove),2035 .remove = spear1340_pinctrl_remove,
2036};2036};
2037 2037
2038static int __init spear1340_pinctrl_init(void)2038static int __init spear1340_pinctrl_init(void)
drivers/pinctrl/spear/pinctrl-spear300.c+3−3
@@ -646,7 +646,7 @@ static struct spear_function *spear300_functions[] = { · 645 unmodified lines
646 &gpio1_function,646 &gpio1_function,
647};647};
648 648
649static struct of_device_id spear300_pinctrl_of_match[] __devinitdata = {649static struct of_device_id spear300_pinctrl_of_match[] = {
650 {650 {
651 .compatible = "st,spear300-pinmux",651 .compatible = "st,spear300-pinmux",
652 },652 },
@@ -677,7 +677,7 @@ static int __devinit spear300_pinctrl_probe(struct platform_device *pdev) · 24 unmodified lines
677 return 0;677 return 0;
678}678}
679 679
680static int __devexit spear300_pinctrl_remove(struct platform_device *pdev)680static int spear300_pinctrl_remove(struct platform_device *pdev)
681{681{
682 return spear_pinctrl_remove(pdev);682 return spear_pinctrl_remove(pdev);
683}683}
@@ -689,7 +689,7 @@ static struct platform_driver spear300_pinctrl_driver = { · 5 unmodified lines
689 .of_match_table = spear300_pinctrl_of_match,689 .of_match_table = spear300_pinctrl_of_match,
690 },690 },
691 .probe = spear300_pinctrl_probe,691 .probe = spear300_pinctrl_probe,
692 .remove = __devexit_p(spear300_pinctrl_remove),692 .remove = spear300_pinctrl_remove,
693};693};
694 694
695static int __init spear300_pinctrl_init(void)695static int __init spear300_pinctrl_init(void)
drivers/pinctrl/spear/pinctrl-spear310.c+3−3
@@ -371,7 +371,7 @@ static struct spear_function *spear310_functions[] = { · 370 unmodified lines
371 &tdm_function,371 &tdm_function,
372};372};
373 373
374static struct of_device_id spear310_pinctrl_of_match[] __devinitdata = {374static struct of_device_id spear310_pinctrl_of_match[] = {
375 {375 {
376 .compatible = "st,spear310-pinmux",376 .compatible = "st,spear310-pinmux",
377 },377 },
@@ -400,7 +400,7 @@ static int __devinit spear310_pinctrl_probe(struct platform_device *pdev) · 22 unmodified lines
400 return 0;400 return 0;
401}401}
402 402
403static int __devexit spear310_pinctrl_remove(struct platform_device *pdev)403static int spear310_pinctrl_remove(struct platform_device *pdev)
404{404{
405 return spear_pinctrl_remove(pdev);405 return spear_pinctrl_remove(pdev);
406}406}
@@ -412,7 +412,7 @@ static struct platform_driver spear310_pinctrl_driver = { · 5 unmodified lines
412 .of_match_table = spear310_pinctrl_of_match,412 .of_match_table = spear310_pinctrl_of_match,
413 },413 },
414 .probe = spear310_pinctrl_probe,414 .probe = spear310_pinctrl_probe,
415 .remove = __devexit_p(spear310_pinctrl_remove),415 .remove = spear310_pinctrl_remove,
416};416};
417 417
418static int __init spear310_pinctrl_init(void)418static int __init spear310_pinctrl_init(void)
drivers/pinctrl/spear/pinctrl-spear320.c+3−3
@@ -3410,7 +3410,7 @@ static struct spear_function *spear320_functions[] = { · 3409 unmodified lines
3410 &i2c2_function,3410 &i2c2_function,
3411};3411};
3412 3412
3413static struct of_device_id spear320_pinctrl_of_match[] __devinitdata = {3413static struct of_device_id spear320_pinctrl_of_match[] = {
3414 {3414 {
3415 .compatible = "st,spear320-pinmux",3415 .compatible = "st,spear320-pinmux",
3416 },3416 },
@@ -3441,7 +3441,7 @@ static int __devinit spear320_pinctrl_probe(struct platform_device *pdev) · 24 unmodified lines
3441 return 0;3441 return 0;
3442}3442}
3443 3443
3444static int __devexit spear320_pinctrl_remove(struct platform_device *pdev)3444static int spear320_pinctrl_remove(struct platform_device *pdev)
3445{3445{
3446 return spear_pinctrl_remove(pdev);3446 return spear_pinctrl_remove(pdev);
3447}3447}
@@ -3453,7 +3453,7 @@ static struct platform_driver spear320_pinctrl_driver = { · 5 unmodified lines
3453 .of_match_table = spear320_pinctrl_of_match,3453 .of_match_table = spear320_pinctrl_of_match,
3454 },3454 },
3455 .probe = spear320_pinctrl_probe,3455 .probe = spear320_pinctrl_probe,
3456 .remove = __devexit_p(spear320_pinctrl_remove),3456 .remove = spear320_pinctrl_remove,
3457};3457};
3458 3458
3459static int __init spear320_pinctrl_init(void)3459static int __init spear320_pinctrl_init(void)
drivers/pnp/pnpbios/core.c+7−13
@@ -91,8 +91,6 @@ struct pnp_dev_node_info node_info; · 90 unmodified lines
91 *91 *
92 */92 */
93 93
94#ifdef CONFIG_HOTPLUG
95
96static struct completion unload_sem;94static struct completion unload_sem;
97 95
98/*96/*
@@ -199,8 +197,6 @@ static int pnp_dock_thread(void *unused) · 100 unmodified lines
199 complete_and_exit(&unload_sem, 0);197 complete_and_exit(&unload_sem, 0);
200}198}
201 199
202#endif /* CONFIG_HOTPLUG */
203
204static int pnpbios_get_resources(struct pnp_dev *dev)200static int pnpbios_get_resources(struct pnp_dev *dev)
205{201{
206 u8 nodenum = dev->number;202 u8 nodenum = dev->number;
@@ -573,21 +569,19 @@ fs_initcall(pnpbios_init); · 366 unmodified lines
573 569
574static int __init pnpbios_thread_init(void)570static int __init pnpbios_thread_init(void)
575{571{
572 struct task_struct *task;
576#if defined(CONFIG_PPC)573#if defined(CONFIG_PPC)
577 if (check_legacy_ioport(PNPBIOS_BASE))574 if (check_legacy_ioport(PNPBIOS_BASE))
578 return 0;575 return 0;
579#endif576#endif
580 if (pnpbios_disabled)577 if (pnpbios_disabled)
581 return 0;578 return 0;
582#ifdef CONFIG_HOTPLUG579
583 {580 init_completion(&unload_sem);
584 struct task_struct *task;581 task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
585 init_completion(&unload_sem);582 if (IS_ERR(task))
586 task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");583 return PTR_ERR(task);
587 if (IS_ERR(task))584
588 return PTR_ERR(task);
589 }
590#endif
591 return 0;585 return 0;
592}586}
593 587
drivers/power/88pm860x_battery.c+3−3
@@ -901,7 +901,7 @@ static enum power_supply_property pm860x_batt_props[] = { · 900 unmodified lines
901 POWER_SUPPLY_PROP_TEMP,901 POWER_SUPPLY_PROP_TEMP,
902};902};
903 903
904static __devinit int pm860x_battery_probe(struct platform_device *pdev)904static int pm860x_battery_probe(struct platform_device *pdev)
905{905{
906 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);906 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
907 struct pm860x_battery_info *info;907 struct pm860x_battery_info *info;
@@ -989,7 +989,7 @@ out: · 81 unmodified lines
989 return ret;989 return ret;
990}990}
991 991
992static int __devexit pm860x_battery_remove(struct platform_device *pdev)992static int pm860x_battery_remove(struct platform_device *pdev)
993{993{
994 struct pm860x_battery_info *info = platform_get_drvdata(pdev);994 struct pm860x_battery_info *info = platform_get_drvdata(pdev);
995 995
@@ -1033,7 +1033,7 @@ static struct platform_driver pm860x_battery_driver = { · 37 unmodified lines
1033 .pm = &pm860x_battery_pm_ops,1033 .pm = &pm860x_battery_pm_ops,
1034 },1034 },
1035 .probe = pm860x_battery_probe,1035 .probe = pm860x_battery_probe,
1036 .remove = __devexit_p(pm860x_battery_remove),1036 .remove = pm860x_battery_remove,
1037};1037};
1038module_platform_driver(pm860x_battery_driver);1038module_platform_driver(pm860x_battery_driver);
1039 1039
drivers/power/88pm860x_charger.c+3−3
@@ -645,7 +645,7 @@ static struct pm860x_irq_desc { · 644 unmodified lines
645 { "vchg", pm860x_vchg_handler },645 { "vchg", pm860x_vchg_handler },
646};646};
647 647
648static __devinit int pm860x_charger_probe(struct platform_device *pdev)648static int pm860x_charger_probe(struct platform_device *pdev)
649{649{
650 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);650 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
651 struct pm860x_charger_info *info;651 struct pm860x_charger_info *info;
@@ -718,7 +718,7 @@ out: · 66 unmodified lines
718 return ret;718 return ret;
719}719}
720 720
721static int __devexit pm860x_charger_remove(struct platform_device *pdev)721static int pm860x_charger_remove(struct platform_device *pdev)
722{722{
723 struct pm860x_charger_info *info = platform_get_drvdata(pdev);723 struct pm860x_charger_info *info = platform_get_drvdata(pdev);
724 int i;724 int i;
@@ -738,7 +738,7 @@ static struct platform_driver pm860x_charger_driver = { · 13 unmodified lines
738 .owner = THIS_MODULE,738 .owner = THIS_MODULE,
739 },739 },
740 .probe = pm860x_charger_probe,740 .probe = pm860x_charger_probe,
741 .remove = __devexit_p(pm860x_charger_remove),741 .remove = pm860x_charger_remove,
742};742};
743module_platform_driver(pm860x_charger_driver);743module_platform_driver(pm860x_charger_driver);
744 744
drivers/power/ab8500_btemp.c+3−3
@@ -938,7 +938,7 @@ static int ab8500_btemp_suspend(struct platform_device *pdev, · 937 unmodified lines
938#define ab8500_btemp_resume NULL938#define ab8500_btemp_resume NULL
939#endif939#endif
940 940
941static int __devexit ab8500_btemp_remove(struct platform_device *pdev)941static int ab8500_btemp_remove(struct platform_device *pdev)
942{942{
943 struct ab8500_btemp *di = platform_get_drvdata(pdev);943 struct ab8500_btemp *di = platform_get_drvdata(pdev);
944 int i, irq;944 int i, irq;
@@ -960,7 +960,7 @@ static int __devexit ab8500_btemp_remove(struct platform_device *pdev) · 15 unmodified lines
960 return 0;960 return 0;
961}961}
962 962
963static int __devinit ab8500_btemp_probe(struct platform_device *pdev)963static int ab8500_btemp_probe(struct platform_device *pdev)
964{964{
965 int irq, i, ret = 0;965 int irq, i, ret = 0;
966 u8 val;966 u8 val;
@@ -1101,7 +1101,7 @@ free_device_info: · 134 unmodified lines
1101 1101
1102static struct platform_driver ab8500_btemp_driver = {1102static struct platform_driver ab8500_btemp_driver = {
1103 .probe = ab8500_btemp_probe,1103 .probe = ab8500_btemp_probe,
1104 .remove = __devexit_p(ab8500_btemp_remove),1104 .remove = ab8500_btemp_remove,
1105 .suspend = ab8500_btemp_suspend,1105 .suspend = ab8500_btemp_suspend,
1106 .resume = ab8500_btemp_resume,1106 .resume = ab8500_btemp_resume,
1107 .driver = {1107 .driver = {
drivers/power/ab8500_charger.c+3−3
@@ -2490,7 +2490,7 @@ static int ab8500_charger_suspend(struct platform_device *pdev, · 2489 unmodified lines
2490#define ab8500_charger_resume NULL2490#define ab8500_charger_resume NULL
2491#endif2491#endif
2492 2492
2493static int __devexit ab8500_charger_remove(struct platform_device *pdev)2493static int ab8500_charger_remove(struct platform_device *pdev)
2494{2494{
2495 struct ab8500_charger *di = platform_get_drvdata(pdev);2495 struct ab8500_charger *di = platform_get_drvdata(pdev);
2496 int i, irq, ret;2496 int i, irq, ret;
@@ -2531,7 +2531,7 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev) · 34 unmodified lines
2531 return 0;2531 return 0;
2532}2532}
2533 2533
2534static int __devinit ab8500_charger_probe(struct platform_device *pdev)2534static int ab8500_charger_probe(struct platform_device *pdev)
2535{2535{
2536 int irq, i, charger_status, ret = 0;2536 int irq, i, charger_status, ret = 0;
2537 struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;2537 struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
@@ -2765,7 +2765,7 @@ free_device_info: · 227 unmodified lines
2765 2765
2766static struct platform_driver ab8500_charger_driver = {2766static struct platform_driver ab8500_charger_driver = {
2767 .probe = ab8500_charger_probe,2767 .probe = ab8500_charger_probe,
2768 .remove = __devexit_p(ab8500_charger_remove),2768 .remove = ab8500_charger_remove,
2769 .suspend = ab8500_charger_suspend,2769 .suspend = ab8500_charger_suspend,
2770 .resume = ab8500_charger_resume,2770 .resume = ab8500_charger_resume,
2771 .driver = {2771 .driver = {
drivers/power/ab8500_fg.c+3−3
@@ -2411,7 +2411,7 @@ static int ab8500_fg_suspend(struct platform_device *pdev, · 2410 unmodified lines
2411#define ab8500_fg_resume NULL2411#define ab8500_fg_resume NULL
2412#endif2412#endif
2413 2413
2414static int __devexit ab8500_fg_remove(struct platform_device *pdev)2414static int ab8500_fg_remove(struct platform_device *pdev)
2415{2415{
2416 int ret = 0;2416 int ret = 0;
2417 struct ab8500_fg *di = platform_get_drvdata(pdev);2417 struct ab8500_fg *di = platform_get_drvdata(pdev);
@@ -2442,7 +2442,7 @@ static struct ab8500_fg_interrupts ab8500_fg_irq[] = { · 24 unmodified lines
2442 {"CCEOC", ab8500_fg_cc_data_end_handler},2442 {"CCEOC", ab8500_fg_cc_data_end_handler},
2443};2443};
2444 2444
2445static int __devinit ab8500_fg_probe(struct platform_device *pdev)2445static int ab8500_fg_probe(struct platform_device *pdev)
2446{2446{
2447 int i, irq;2447 int i, irq;
2448 int ret = 0;2448 int ret = 0;
@@ -2614,7 +2614,7 @@ free_device_info: · 165 unmodified lines
2614 2614
2615static struct platform_driver ab8500_fg_driver = {2615static struct platform_driver ab8500_fg_driver = {
2616 .probe = ab8500_fg_probe,2616 .probe = ab8500_fg_probe,
2617 .remove = __devexit_p(ab8500_fg_remove),2617 .remove = ab8500_fg_remove,
2618 .suspend = ab8500_fg_suspend,2618 .suspend = ab8500_fg_suspend,
2619 .resume = ab8500_fg_resume,2619 .resume = ab8500_fg_resume,
2620 .driver = {2620 .driver = {
drivers/power/abx500_chargalg.c+3−3
@@ -1782,7 +1782,7 @@ static int abx500_chargalg_suspend(struct platform_device *pdev, · 1781 unmodified lines
1782#define abx500_chargalg_resume NULL1782#define abx500_chargalg_resume NULL
1783#endif1783#endif
1784 1784
1785static int __devexit abx500_chargalg_remove(struct platform_device *pdev)1785static int abx500_chargalg_remove(struct platform_device *pdev)
1786{1786{
1787 struct abx500_chargalg *di = platform_get_drvdata(pdev);1787 struct abx500_chargalg *di = platform_get_drvdata(pdev);
1788 1788
@@ -1800,7 +1800,7 @@ static int __devexit abx500_chargalg_remove(struct platform_device *pdev) · 11 unmodified lines
1800 return 0;1800 return 0;
1801}1801}
1802 1802
1803static int __devinit abx500_chargalg_probe(struct platform_device *pdev)1803static int abx500_chargalg_probe(struct platform_device *pdev)
1804{1804{
1805 struct abx500_bm_plat_data *plat_data;1805 struct abx500_bm_plat_data *plat_data;
1806 int ret = 0;1806 int ret = 0;
@@ -1893,7 +1893,7 @@ free_device_info: · 86 unmodified lines
1893 1893
1894static struct platform_driver abx500_chargalg_driver = {1894static struct platform_driver abx500_chargalg_driver = {
1895 .probe = abx500_chargalg_probe,1895 .probe = abx500_chargalg_probe,
1896 .remove = __devexit_p(abx500_chargalg_remove),1896 .remove = abx500_chargalg_remove,
1897 .suspend = abx500_chargalg_suspend,1897 .suspend = abx500_chargalg_suspend,
1898 .resume = abx500_chargalg_resume,1898 .resume = abx500_chargalg_resume,
1899 .driver = {1899 .driver = {
drivers/power/avs/smartreflex.c+4−4
@@ -1026,7 +1026,7 @@ err_free_devinfo: · 1025 unmodified lines
1026 return ret;1026 return ret;
1027}1027}
1028 1028
1029static int __devexit omap_sr_remove(struct platform_device *pdev)1029static int omap_sr_remove(struct platform_device *pdev)
1030{1030{
1031 struct omap_sr_data *pdata = pdev->dev.platform_data;1031 struct omap_sr_data *pdata = pdev->dev.platform_data;
1032 struct omap_sr *sr_info;1032 struct omap_sr *sr_info;
@@ -1059,7 +1059,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev) · 26 unmodified lines
1059 return 0;1059 return 0;
1060}1060}
1061 1061
1062static void __devexit omap_sr_shutdown(struct platform_device *pdev)1062static void omap_sr_shutdown(struct platform_device *pdev)
1063{1063{
1064 struct omap_sr_data *pdata = pdev->dev.platform_data;1064 struct omap_sr_data *pdata = pdev->dev.platform_data;
1065 struct omap_sr *sr_info;1065 struct omap_sr *sr_info;
@@ -1083,8 +1083,8 @@ static void __devexit omap_sr_shutdown(struct platform_device *pdev) · 17 unmodified lines
1083}1083}
1084 1084
1085static struct platform_driver smartreflex_driver = {1085static struct platform_driver smartreflex_driver = {
1086 .remove = __devexit_p(omap_sr_remove),1086 .remove = omap_sr_remove,
1087 .shutdown = __devexit_p(omap_sr_shutdown),1087 .shutdown = omap_sr_shutdown,
1088 .driver = {1088 .driver = {
1089 .name = "smartreflex",1089 .name = "smartreflex",
1090 },1090 },
drivers/power/bq27x00_battery.c+3−3
@@ -926,7 +926,7 @@ static int bq27000_read_platform(struct bq27x00_device_info *di, u8 reg, · 925 unmodified lines
926 return pdata->read(dev, reg);926 return pdata->read(dev, reg);
927}927}
928 928
929static int __devinit bq27000_battery_probe(struct platform_device *pdev)929static int bq27000_battery_probe(struct platform_device *pdev)
930{930{
931 struct bq27x00_device_info *di;931 struct bq27x00_device_info *di;
932 struct bq27000_platform_data *pdata = pdev->dev.platform_data;932 struct bq27000_platform_data *pdata = pdev->dev.platform_data;
@@ -969,7 +969,7 @@ err_free: · 36 unmodified lines
969 return ret;969 return ret;
970}970}
971 971
972static int __devexit bq27000_battery_remove(struct platform_device *pdev)972static int bq27000_battery_remove(struct platform_device *pdev)
973{973{
974 struct bq27x00_device_info *di = platform_get_drvdata(pdev);974 struct bq27x00_device_info *di = platform_get_drvdata(pdev);
975 975
@@ -983,7 +983,7 @@ static int __devexit bq27000_battery_remove(struct platform_device *pdev) · 7 unmodified lines
983 983
984static struct platform_driver bq27000_battery_driver = {984static struct platform_driver bq27000_battery_driver = {
985 .probe = bq27000_battery_probe,985 .probe = bq27000_battery_probe,
986 .remove = __devexit_p(bq27000_battery_remove),986 .remove = bq27000_battery_remove,
987 .driver = {987 .driver = {
988 .name = "bq27000-battery",988 .name = "bq27000-battery",
989 .owner = THIS_MODULE,989 .owner = THIS_MODULE,
drivers/power/charger-manager.c+2−2
@@ -1655,7 +1655,7 @@ err_alloc: · 1654 unmodified lines
1655 return ret;1655 return ret;
1656}1656}
1657 1657
1658static int __devexit charger_manager_remove(struct platform_device *pdev)1658static int charger_manager_remove(struct platform_device *pdev)
1659{1659{
1660 struct charger_manager *cm = platform_get_drvdata(pdev);1660 struct charger_manager *cm = platform_get_drvdata(pdev);
1661 struct charger_desc *desc = cm->desc;1661 struct charger_desc *desc = cm->desc;
@@ -1812,7 +1812,7 @@ static struct platform_driver charger_manager_driver = { · 150 unmodified lines
1812 .pm = &charger_manager_pm,1812 .pm = &charger_manager_pm,
1813 },1813 },
1814 .probe = charger_manager_probe,1814 .probe = charger_manager_probe,
1815 .remove = __devexit_p(charger_manager_remove),1815 .remove = charger_manager_remove,
1816 .id_table = charger_manager_id,1816 .id_table = charger_manager_id,
1817};1817};
1818 1818
drivers/power/collie_battery.c+3−3
@@ -305,7 +305,7 @@ static int collie_bat_resume(struct ucb1x00_dev *dev) · 304 unmodified lines
305#define collie_bat_resume NULL305#define collie_bat_resume NULL
306#endif306#endif
307 307
308static int __devinit collie_bat_probe(struct ucb1x00_dev *dev)308static int collie_bat_probe(struct ucb1x00_dev *dev)
309{309{
310 int ret;310 int ret;
311 311
@@ -349,7 +349,7 @@ err_psy_reg_main: · 37 unmodified lines
349 return ret;349 return ret;
350}350}
351 351
352static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)352static void collie_bat_remove(struct ucb1x00_dev *dev)
353{353{
354 free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);354 free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);
355 355
@@ -367,7 +367,7 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev) · 11 unmodified lines
367 367
368static struct ucb1x00_driver collie_bat_driver = {368static struct ucb1x00_driver collie_bat_driver = {
369 .add = collie_bat_probe,369 .add = collie_bat_probe,
370 .remove = __devexit_p(collie_bat_remove),370 .remove = collie_bat_remove,
371 .suspend = collie_bat_suspend,371 .suspend = collie_bat_suspend,
372 .resume = collie_bat_resume,372 .resume = collie_bat_resume,
373};373};
drivers/power/da9052-battery.c+3−3
@@ -576,7 +576,7 @@ static const char *const da9052_bat_irqs[] = { · 575 unmodified lines
576 "CHG END",576 "CHG END",
577};577};
578 578
579static s32 __devinit da9052_bat_probe(struct platform_device *pdev)579static s32 da9052_bat_probe(struct platform_device *pdev)
580{580{
581 struct da9052_pdata *pdata;581 struct da9052_pdata *pdata;
582 struct da9052_battery *bat;582 struct da9052_battery *bat;
@@ -630,7 +630,7 @@ err: · 47 unmodified lines
630 kfree(bat);630 kfree(bat);
631 return ret;631 return ret;
632}632}
633static int __devexit da9052_bat_remove(struct platform_device *pdev)633static int da9052_bat_remove(struct platform_device *pdev)
634{634{
635 int i;635 int i;
636 int irq;636 int irq;
@@ -648,7 +648,7 @@ static int __devexit da9052_bat_remove(struct platform_device *pdev) · 11 unmodified lines
648 648
649static struct platform_driver da9052_bat_driver = {649static struct platform_driver da9052_bat_driver = {
650 .probe = da9052_bat_probe,650 .probe = da9052_bat_probe,
651 .remove = __devexit_p(da9052_bat_remove),651 .remove = da9052_bat_remove,
652 .driver = {652 .driver = {
653 .name = "da9052-bat",653 .name = "da9052-bat",
654 .owner = THIS_MODULE,654 .owner = THIS_MODULE,
drivers/power/ds2780_battery.c+3−3
@@ -755,7 +755,7 @@ static const struct attribute_group ds2780_attr_group = { · 754 unmodified lines
755 .attrs = ds2780_attributes,755 .attrs = ds2780_attributes,
756};756};
757 757
758static int __devinit ds2780_battery_probe(struct platform_device *pdev)758static int ds2780_battery_probe(struct platform_device *pdev)
759{759{
760 int ret = 0;760 int ret = 0;
761 struct ds2780_device_info *dev_info;761 struct ds2780_device_info *dev_info;
@@ -819,7 +819,7 @@ fail: · 57 unmodified lines
819 return ret;819 return ret;
820}820}
821 821
822static int __devexit ds2780_battery_remove(struct platform_device *pdev)822static int ds2780_battery_remove(struct platform_device *pdev)
823{823{
824 struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);824 struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
825 825
@@ -837,7 +837,7 @@ static struct platform_driver ds2780_battery_driver = { · 11 unmodified lines
837 .name = "ds2780-battery",837 .name = "ds2780-battery",
838 },838 },
839 .probe = ds2780_battery_probe,839 .probe = ds2780_battery_probe,
840 .remove = __devexit_p(ds2780_battery_remove),840 .remove = ds2780_battery_remove,
841};841};
842 842
843module_platform_driver(ds2780_battery_driver);843module_platform_driver(ds2780_battery_driver);
drivers/power/ds2781_battery.c+3−3
@@ -750,7 +750,7 @@ static const struct attribute_group ds2781_attr_group = { · 749 unmodified lines
750 .attrs = ds2781_attributes,750 .attrs = ds2781_attributes,
751};751};
752 752
753static int __devinit ds2781_battery_probe(struct platform_device *pdev)753static int ds2781_battery_probe(struct platform_device *pdev)
754{754{
755 int ret = 0;755 int ret = 0;
756 struct ds2781_device_info *dev_info;756 struct ds2781_device_info *dev_info;
@@ -810,7 +810,7 @@ fail: · 53 unmodified lines
810 return ret;810 return ret;
811}811}
812 812
813static int __devexit ds2781_battery_remove(struct platform_device *pdev)813static int ds2781_battery_remove(struct platform_device *pdev)
814{814{
815 struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);815 struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);
816 816
@@ -827,7 +827,7 @@ static struct platform_driver ds2781_battery_driver = { · 10 unmodified lines
827 .name = "ds2781-battery",827 .name = "ds2781-battery",
828 },828 },
829 .probe = ds2781_battery_probe,829 .probe = ds2781_battery_probe,
830 .remove = __devexit_p(ds2781_battery_remove),830 .remove = ds2781_battery_remove,
831};831};
832module_platform_driver(ds2781_battery_driver);832module_platform_driver(ds2781_battery_driver);
833 833
drivers/power/generic-adc-battery.c+3−3
@@ -236,7 +236,7 @@ static irqreturn_t gab_charged(int irq, void *dev_id) · 235 unmodified lines
236 return IRQ_HANDLED;236 return IRQ_HANDLED;
237}237}
238 238
239static int __devinit gab_probe(struct platform_device *pdev)239static int gab_probe(struct platform_device *pdev)
240{240{
241 struct gab *adc_bat;241 struct gab *adc_bat;
242 struct power_supply *psy;242 struct power_supply *psy;
@@ -351,7 +351,7 @@ first_mem_fail: · 108 unmodified lines
351 return ret;351 return ret;
352}352}
353 353
354static int __devexit gab_remove(struct platform_device *pdev)354static int gab_remove(struct platform_device *pdev)
355{355{
356 int chan;356 int chan;
357 struct gab *adc_bat = platform_get_drvdata(pdev);357 struct gab *adc_bat = platform_get_drvdata(pdev);
@@ -413,7 +413,7 @@ static struct platform_driver gab_driver = { · 55 unmodified lines
413 .pm = GAB_PM_OPS413 .pm = GAB_PM_OPS
414 },414 },
415 .probe = gab_probe,415 .probe = gab_probe,
416 .remove = __devexit_p(gab_remove),416 .remove = gab_remove,
417};417};
418module_platform_driver(gab_driver);418module_platform_driver(gab_driver);
419 419
drivers/power/gpio-charger.c+3−3
@@ -68,7 +68,7 @@ static enum power_supply_property gpio_charger_properties[] = { · 67 unmodified lines
68 POWER_SUPPLY_PROP_ONLINE,68 POWER_SUPPLY_PROP_ONLINE,
69};69};
70 70
71static int __devinit gpio_charger_probe(struct platform_device *pdev)71static int gpio_charger_probe(struct platform_device *pdev)
72{72{
73 const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data;73 const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data;
74 struct gpio_charger *gpio_charger;74 struct gpio_charger *gpio_charger;
@@ -144,7 +144,7 @@ err_free: · 69 unmodified lines
144 return ret;144 return ret;
145}145}
146 146
147static int __devexit gpio_charger_remove(struct platform_device *pdev)147static int gpio_charger_remove(struct platform_device *pdev)
148{148{
149 struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);149 struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
150 150
@@ -177,7 +177,7 @@ static SIMPLE_DEV_PM_OPS(gpio_charger_pm_ops, NULL, gpio_charger_resume); · 26 unmodified lines
177 177
178static struct platform_driver gpio_charger_driver = {178static struct platform_driver gpio_charger_driver = {
179 .probe = gpio_charger_probe,179 .probe = gpio_charger_probe,
180 .remove = __devexit_p(gpio_charger_remove),180 .remove = gpio_charger_remove,
181 .driver = {181 .driver = {
182 .name = "gpio-charger",182 .name = "gpio-charger",
183 .owner = THIS_MODULE,183 .owner = THIS_MODULE,
drivers/power/intel_mid_battery.c+4−4
@@ -649,7 +649,7 @@ static void pmic_battery_handle_intrpt(struct work_struct *work) · 648 unmodified lines
649 * PMIC battery initializes its internal data structue and other649 * PMIC battery initializes its internal data structue and other
650 * infrastructure components for it to work as expected.650 * infrastructure components for it to work as expected.
651 */651 */
652static __devinit int probe(int irq, struct device *dev)652static int probe(int irq, struct device *dev)
653{653{
654 int retval = 0;654 int retval = 0;
655 struct pmic_power_module_info *pbi;655 struct pmic_power_module_info *pbi;
@@ -739,7 +739,7 @@ wqueue_failed: · 83 unmodified lines
739 return retval;739 return retval;
740}740}
741 741
742static int __devinit platform_pmic_battery_probe(struct platform_device *pdev)742static int platform_pmic_battery_probe(struct platform_device *pdev)
743{743{
744 return probe(pdev->id, &pdev->dev);744 return probe(pdev->id, &pdev->dev);
745}745}
@@ -754,7 +754,7 @@ static int __devinit platform_pmic_battery_probe(struct platform_device *pdev) · 8 unmodified lines
754 * pmic_battery_probe.754 * pmic_battery_probe.
755 */755 */
756 756
757static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)757static int platform_pmic_battery_remove(struct platform_device *pdev)
758{758{
759 struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);759 struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
760 760
@@ -776,7 +776,7 @@ static struct platform_driver platform_pmic_battery_driver = { · 15 unmodified lines
776 .owner = THIS_MODULE,776 .owner = THIS_MODULE,
777 },777 },
778 .probe = platform_pmic_battery_probe,778 .probe = platform_pmic_battery_probe,
779 .remove = __devexit_p(platform_pmic_battery_remove),779 .remove = platform_pmic_battery_remove,
780};780};
781 781
782module_platform_driver(platform_pmic_battery_driver);782module_platform_driver(platform_pmic_battery_driver);
drivers/power/isp1704_charger.c+3−3
@@ -406,7 +406,7 @@ static inline int isp1704_test_ulpi(struct isp1704_charger *isp) · 405 unmodified lines
406 return -ENODEV;406 return -ENODEV;
407}407}
408 408
409static int __devinit isp1704_charger_probe(struct platform_device *pdev)409static int isp1704_charger_probe(struct platform_device *pdev)
410{410{
411 struct isp1704_charger *isp;411 struct isp1704_charger *isp;
412 int ret = -ENODEV;412 int ret = -ENODEV;
@@ -484,7 +484,7 @@ fail0: · 71 unmodified lines
484 return ret;484 return ret;
485}485}
486 486
487static int __devexit isp1704_charger_remove(struct platform_device *pdev)487static int isp1704_charger_remove(struct platform_device *pdev)
488{488{
489 struct isp1704_charger *isp = platform_get_drvdata(pdev);489 struct isp1704_charger *isp = platform_get_drvdata(pdev);
490 490
@@ -502,7 +502,7 @@ static struct platform_driver isp1704_charger_driver = { · 11 unmodified lines
502 .name = "isp1704_charger",502 .name = "isp1704_charger",
503 },503 },
504 .probe = isp1704_charger_probe,504 .probe = isp1704_charger_probe,
505 .remove = __devexit_p(isp1704_charger_remove),505 .remove = isp1704_charger_remove,
506};506};
507 507
508module_platform_driver(isp1704_charger_driver);508module_platform_driver(isp1704_charger_driver);
drivers/power/jz4740-battery.c+3−3
@@ -238,7 +238,7 @@ static void jz_battery_work(struct work_struct *work) · 237 unmodified lines
238 schedule_delayed_work(&jz_battery->work, interval);238 schedule_delayed_work(&jz_battery->work, interval);
239}239}
240 240
241static int __devinit jz_battery_probe(struct platform_device *pdev)241static int jz_battery_probe(struct platform_device *pdev)
242{242{
243 int ret = 0;243 int ret = 0;
244 struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;244 struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;
@@ -376,7 +376,7 @@ err_free: · 131 unmodified lines
376 return ret;376 return ret;
377}377}
378 378
379static int __devexit jz_battery_remove(struct platform_device *pdev)379static int jz_battery_remove(struct platform_device *pdev)
380{380{
381 struct jz_battery *jz_battery = platform_get_drvdata(pdev);381 struct jz_battery *jz_battery = platform_get_drvdata(pdev);
382 382
@@ -431,7 +431,7 @@ static const struct dev_pm_ops jz_battery_pm_ops = { · 48 unmodified lines
431 431
432static struct platform_driver jz_battery_driver = {432static struct platform_driver jz_battery_driver = {
433 .probe = jz_battery_probe,433 .probe = jz_battery_probe,
434 .remove = __devexit_p(jz_battery_remove),434 .remove = jz_battery_remove,
435 .driver = {435 .driver = {
436 .name = "jz4740-battery",436 .name = "jz4740-battery",
437 .owner = THIS_MODULE,437 .owner = THIS_MODULE,
drivers/power/lp8727_charger.c+2−2
@@ -522,7 +522,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id) · 521 unmodified lines
522 return 0;522 return 0;
523}523}
524 524
525static int __devexit lp8727_remove(struct i2c_client *cl)525static int lp8727_remove(struct i2c_client *cl)
526{526{
527 struct lp8727_chg *pchg = i2c_get_clientdata(cl);527 struct lp8727_chg *pchg = i2c_get_clientdata(cl);
528 528
@@ -542,7 +542,7 @@ static struct i2c_driver lp8727_driver = { · 13 unmodified lines
542 .name = "lp8727",542 .name = "lp8727",
543 },543 },
544 .probe = lp8727_probe,544 .probe = lp8727_probe,
545 .remove = __devexit_p(lp8727_remove),545 .remove = lp8727_remove,
546 .id_table = lp8727_ids,546 .id_table = lp8727_ids,
547};547};
548module_i2c_driver(lp8727_driver);548module_i2c_driver(lp8727_driver);
drivers/power/lp8788-charger.c+3−3
@@ -729,7 +729,7 @@ static const struct attribute_group lp8788_attr_group = { · 728 unmodified lines
729 .attrs = lp8788_charger_attr,729 .attrs = lp8788_charger_attr,
730};730};
731 731
732static __devinit int lp8788_charger_probe(struct platform_device *pdev)732static int lp8788_charger_probe(struct platform_device *pdev)
733{733{
734 struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);734 struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
735 struct lp8788_charger *pchg;735 struct lp8788_charger *pchg;
@@ -766,7 +766,7 @@ static __devinit int lp8788_charger_probe(struct platform_device *pdev) · 30 unmodified lines
766 return 0;766 return 0;
767}767}
768 768
769static int __devexit lp8788_charger_remove(struct platform_device *pdev)769static int lp8788_charger_remove(struct platform_device *pdev)
770{770{
771 struct lp8788_charger *pchg = platform_get_drvdata(pdev);771 struct lp8788_charger *pchg = platform_get_drvdata(pdev);
772 772
@@ -781,7 +781,7 @@ static int __devexit lp8788_charger_remove(struct platform_device *pdev) · 8 unmodified lines
781 781
782static struct platform_driver lp8788_charger_driver = {782static struct platform_driver lp8788_charger_driver = {
783 .probe = lp8788_charger_probe,783 .probe = lp8788_charger_probe,
784 .remove = __devexit_p(lp8788_charger_remove),784 .remove = lp8788_charger_remove,
785 .driver = {785 .driver = {
786 .name = LP8788_DEV_CHARGER,786 .name = LP8788_DEV_CHARGER,
787 .owner = THIS_MODULE,787 .owner = THIS_MODULE,
drivers/power/max17040_battery.c+3−3
@@ -197,7 +197,7 @@ static enum power_supply_property max17040_battery_props[] = { · 196 unmodified lines
197 POWER_SUPPLY_PROP_CAPACITY,197 POWER_SUPPLY_PROP_CAPACITY,
198};198};
199 199
200static int __devinit max17040_probe(struct i2c_client *client,200static int max17040_probe(struct i2c_client *client,
201 const struct i2c_device_id *id)201 const struct i2c_device_id *id)
202{202{
203 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);203 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@@ -238,7 +238,7 @@ static int __devinit max17040_probe(struct i2c_client *client, · 34 unmodified lines
238 return 0;238 return 0;
239}239}
240 240
241static int __devexit max17040_remove(struct i2c_client *client)241static int max17040_remove(struct i2c_client *client)
242{242{
243 struct max17040_chip *chip = i2c_get_clientdata(client);243 struct max17040_chip *chip = i2c_get_clientdata(client);
244 244
@@ -285,7 +285,7 @@ static struct i2c_driver max17040_i2c_driver = { · 40 unmodified lines
285 .name = "max17040",285 .name = "max17040",
286 },286 },
287 .probe = max17040_probe,287 .probe = max17040_probe,
288 .remove = __devexit_p(max17040_remove),288 .remove = max17040_remove,
289 .suspend = max17040_suspend,289 .suspend = max17040_suspend,
290 .resume = max17040_resume,290 .resume = max17040_resume,
291 .id_table = max17040_id,291 .id_table = max17040_id,
drivers/power/max17042_battery.c+3−3
@@ -681,7 +681,7 @@ max17042_get_pdata(struct device *dev) · 680 unmodified lines
681}681}
682#endif682#endif
683 683
684static int __devinit max17042_probe(struct i2c_client *client,684static int max17042_probe(struct i2c_client *client,
685 const struct i2c_device_id *id)685 const struct i2c_device_id *id)
686{686{
687 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);687 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@@ -775,7 +775,7 @@ static int __devinit max17042_probe(struct i2c_client *client, · 87 unmodified lines
775 return 0;775 return 0;
776}776}
777 777
778static int __devexit max17042_remove(struct i2c_client *client)778static int max17042_remove(struct i2c_client *client)
779{779{
780 struct max17042_chip *chip = i2c_get_clientdata(client);780 struct max17042_chip *chip = i2c_get_clientdata(client);
781 781
@@ -851,7 +851,7 @@ static struct i2c_driver max17042_i2c_driver = { · 69 unmodified lines
851 .pm = MAX17042_PM_OPS,851 .pm = MAX17042_PM_OPS,
852 },852 },
853 .probe = max17042_probe,853 .probe = max17042_probe,
854 .remove = __devexit_p(max17042_remove),854 .remove = max17042_remove,
855 .id_table = max17042_id,855 .id_table = max17042_id,
856};856};
857module_i2c_driver(max17042_i2c_driver);857module_i2c_driver(max17042_i2c_driver);
drivers/power/max8903_charger.c+3−3
@@ -179,7 +179,7 @@ static irqreturn_t max8903_fault(int irq, void *_data) · 178 unmodified lines
179 return IRQ_HANDLED;179 return IRQ_HANDLED;
180}180}
181 181
182static __devinit int max8903_probe(struct platform_device *pdev)182static int max8903_probe(struct platform_device *pdev)
183{183{
184 struct max8903_data *data;184 struct max8903_data *data;
185 struct device *dev = &pdev->dev;185 struct device *dev = &pdev->dev;
@@ -345,7 +345,7 @@ err: · 159 unmodified lines
345 return ret;345 return ret;
346}346}
347 347
348static __devexit int max8903_remove(struct platform_device *pdev)348static int max8903_remove(struct platform_device *pdev)
349{349{
350 struct max8903_data *data = platform_get_drvdata(pdev);350 struct max8903_data *data = platform_get_drvdata(pdev);
351 351
@@ -367,7 +367,7 @@ static __devexit int max8903_remove(struct platform_device *pdev) · 15 unmodified lines
367 367
368static struct platform_driver max8903_driver = {368static struct platform_driver max8903_driver = {
369 .probe = max8903_probe,369 .probe = max8903_probe,
370 .remove = __devexit_p(max8903_remove),370 .remove = max8903_remove,
371 .driver = {371 .driver = {
372 .name = "max8903-charger",372 .name = "max8903-charger",
373 .owner = THIS_MODULE,373 .owner = THIS_MODULE,
drivers/power/max8925_power.c+5−5
@@ -356,7 +356,7 @@ do { \ · 355 unmodified lines
356 _irq, ret); \356 _irq, ret); \
357} while (0)357} while (0)
358 358
359static __devinit int max8925_init_charger(struct max8925_chip *chip,359static int max8925_init_charger(struct max8925_chip *chip,
360 struct max8925_power_info *info)360 struct max8925_power_info *info)
361{361{
362 int ret;362 int ret;
@@ -414,7 +414,7 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, · 51 unmodified lines
414 return 0;414 return 0;
415}415}
416 416
417static __devexit int max8925_deinit_charger(struct max8925_power_info *info)417static int max8925_deinit_charger(struct max8925_power_info *info)
418{418{
419 struct max8925_chip *chip = info->chip;419 struct max8925_chip *chip = info->chip;
420 int irq;420 int irq;
@@ -426,7 +426,7 @@ static __devexit int max8925_deinit_charger(struct max8925_power_info *info) · 5 unmodified lines
426 return 0;426 return 0;
427}427}
428 428
429static __devinit int max8925_power_probe(struct platform_device *pdev)429static int max8925_power_probe(struct platform_device *pdev)
430{430{
431 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);431 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
432 struct max8925_power_pdata *pdata = NULL;432 struct max8925_power_pdata *pdata = NULL;
@@ -501,7 +501,7 @@ out: · 68 unmodified lines
501 return ret;501 return ret;
502}502}
503 503
504static __devexit int max8925_power_remove(struct platform_device *pdev)504static int max8925_power_remove(struct platform_device *pdev)
505{505{
506 struct max8925_power_info *info = platform_get_drvdata(pdev);506 struct max8925_power_info *info = platform_get_drvdata(pdev);
507 507
@@ -517,7 +517,7 @@ static __devexit int max8925_power_remove(struct platform_device *pdev) · 9 unmodified lines
517 517
518static struct platform_driver max8925_power_driver = {518static struct platform_driver max8925_power_driver = {
519 .probe = max8925_power_probe,519 .probe = max8925_power_probe,
520 .remove = __devexit_p(max8925_power_remove),520 .remove = max8925_power_remove,
521 .driver = {521 .driver = {
522 .name = "max8925-power",522 .name = "max8925-power",
523 },523 },
drivers/power/max8997_charger.c+3−3
@@ -86,7 +86,7 @@ static int max8997_battery_get_property(struct power_supply *psy, · 85 unmodified lines
86 return 0;86 return 0;
87}87}
88 88
89static __devinit int max8997_battery_probe(struct platform_device *pdev)89static int max8997_battery_probe(struct platform_device *pdev)
90{90{
91 int ret = 0;91 int ret = 0;
92 struct charger_data *charger;92 struct charger_data *charger;
@@ -167,7 +167,7 @@ err: · 74 unmodified lines
167 return ret;167 return ret;
168}168}
169 169
170static int __devexit max8997_battery_remove(struct platform_device *pdev)170static int max8997_battery_remove(struct platform_device *pdev)
171{171{
172 struct charger_data *charger = platform_get_drvdata(pdev);172 struct charger_data *charger = platform_get_drvdata(pdev);
173 173
@@ -187,7 +187,7 @@ static struct platform_driver max8997_battery_driver = { · 13 unmodified lines
187 .owner = THIS_MODULE,187 .owner = THIS_MODULE,
188 },188 },
189 .probe = max8997_battery_probe,189 .probe = max8997_battery_probe,
190 .remove = __devexit_p(max8997_battery_remove),190 .remove = max8997_battery_remove,
191 .id_table = max8997_battery_id,191 .id_table = max8997_battery_id,
192};192};
193 193
drivers/power/max8998_charger.c+3−3
@@ -75,7 +75,7 @@ static int max8998_battery_get_property(struct power_supply *psy, · 74 unmodified lines
75 return 0;75 return 0;
76}76}
77 77
78static __devinit int max8998_battery_probe(struct platform_device *pdev)78static int max8998_battery_probe(struct platform_device *pdev)
79{79{
80 struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);80 struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);
81 struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);81 struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);
@@ -178,7 +178,7 @@ err: · 96 unmodified lines
178 return ret;178 return ret;
179}179}
180 180
181static int __devexit max8998_battery_remove(struct platform_device *pdev)181static int max8998_battery_remove(struct platform_device *pdev)
182{182{
183 struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);183 struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);
184 184
@@ -199,7 +199,7 @@ static struct platform_driver max8998_battery_driver = { · 14 unmodified lines
199 .owner = THIS_MODULE,199 .owner = THIS_MODULE,
200 },200 },
201 .probe = max8998_battery_probe,201 .probe = max8998_battery_probe,
202 .remove = __devexit_p(max8998_battery_remove),202 .remove = max8998_battery_remove,
203 .id_table = max8998_battery_id,203 .id_table = max8998_battery_id,
204};204};
205 205
drivers/power/olpc_battery.c+3−3
@@ -598,7 +598,7 @@ static int olpc_battery_suspend(struct platform_device *pdev, · 597 unmodified lines
598 return 0;598 return 0;
599}599}
600 600
601static int __devinit olpc_battery_probe(struct platform_device *pdev)601static int olpc_battery_probe(struct platform_device *pdev)
602{602{
603 int ret;603 int ret;
604 uint8_t status;604 uint8_t status;
@@ -659,7 +659,7 @@ battery_failed: · 54 unmodified lines
659 return ret;659 return ret;
660}660}
661 661
662static int __devexit olpc_battery_remove(struct platform_device *pdev)662static int olpc_battery_remove(struct platform_device *pdev)
663{663{
664 device_remove_file(olpc_bat.dev, &olpc_bat_error);664 device_remove_file(olpc_bat.dev, &olpc_bat_error);
665 device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);665 device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
@@ -681,7 +681,7 @@ static struct platform_driver olpc_battery_driver = { · 15 unmodified lines
681 .of_match_table = olpc_battery_ids,681 .of_match_table = olpc_battery_ids,
682 },682 },
683 .probe = olpc_battery_probe,683 .probe = olpc_battery_probe,
684 .remove = __devexit_p(olpc_battery_remove),684 .remove = olpc_battery_remove,
685 .suspend = olpc_battery_suspend,685 .suspend = olpc_battery_suspend,
686};686};
687 687
drivers/power/pcf50633-charger.c+3−3
@@ -366,7 +366,7 @@ static const u8 mbc_irq_handlers[] = { · 365 unmodified lines
366 PCF50633_IRQ_LOWBAT,366 PCF50633_IRQ_LOWBAT,
367};367};
368 368
369static int __devinit pcf50633_mbc_probe(struct platform_device *pdev)369static int pcf50633_mbc_probe(struct platform_device *pdev)
370{370{
371 struct pcf50633_mbc *mbc;371 struct pcf50633_mbc *mbc;
372 int ret;372 int ret;
@@ -447,7 +447,7 @@ static int __devinit pcf50633_mbc_probe(struct platform_device *pdev) · 74 unmodified lines
447 return 0;447 return 0;
448}448}
449 449
450static int __devexit pcf50633_mbc_remove(struct platform_device *pdev)450static int pcf50633_mbc_remove(struct platform_device *pdev)
451{451{
452 struct pcf50633_mbc *mbc = platform_get_drvdata(pdev);452 struct pcf50633_mbc *mbc = platform_get_drvdata(pdev);
453 int i;453 int i;
@@ -471,7 +471,7 @@ static struct platform_driver pcf50633_mbc_driver = { · 17 unmodified lines
471 .name = "pcf50633-mbc",471 .name = "pcf50633-mbc",
472 },472 },
473 .probe = pcf50633_mbc_probe,473 .probe = pcf50633_mbc_probe,
474 .remove = __devexit_p(pcf50633_mbc_remove),474 .remove = pcf50633_mbc_remove,
475};475};
476 476
477module_platform_driver(pcf50633_mbc_driver);477module_platform_driver(pcf50633_mbc_driver);
drivers/power/s3c_adc_battery.c+1−1
@@ -286,7 +286,7 @@ static irqreturn_t s3c_adc_bat_charged(int irq, void *dev_id) · 285 unmodified lines
286 return IRQ_HANDLED;286 return IRQ_HANDLED;
287}287}
288 288
289static int __devinit s3c_adc_bat_probe(struct platform_device *pdev)289static int s3c_adc_bat_probe(struct platform_device *pdev)
290{290{
291 struct s3c_adc_client *client;291 struct s3c_adc_client *client;
292 struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;292 struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;
drivers/power/sbs-battery.c+3−3
@@ -675,7 +675,7 @@ static struct sbs_platform_data *sbs_of_populate_pdata( · 674 unmodified lines
675}675}
676#endif676#endif
677 677
678static int __devinit sbs_probe(struct i2c_client *client,678static int sbs_probe(struct i2c_client *client,
679 const struct i2c_device_id *id)679 const struct i2c_device_id *id)
680{680{
681 struct sbs_info *chip;681 struct sbs_info *chip;
@@ -800,7 +800,7 @@ exit_free_name: · 118 unmodified lines
800 return rc;800 return rc;
801}801}
802 802
803static int __devexit sbs_remove(struct i2c_client *client)803static int sbs_remove(struct i2c_client *client)
804{804{
805 struct sbs_info *chip = i2c_get_clientdata(client);805 struct sbs_info *chip = i2c_get_clientdata(client);
806 806
@@ -853,7 +853,7 @@ MODULE_DEVICE_TABLE(i2c, sbs_id); · 46 unmodified lines
853 853
854static struct i2c_driver sbs_battery_driver = {854static struct i2c_driver sbs_battery_driver = {
855 .probe = sbs_probe,855 .probe = sbs_probe,
856 .remove = __devexit_p(sbs_remove),856 .remove = sbs_remove,
857 .suspend = sbs_suspend,857 .suspend = sbs_suspend,
858 .resume = sbs_resume,858 .resume = sbs_resume,
859 .id_table = sbs_id,859 .id_table = sbs_id,
drivers/power/smb347-charger.c+1−1
@@ -1313,7 +1313,7 @@ static struct i2c_driver smb347_driver = { · 1312 unmodified lines
1313 .name = "smb347",1313 .name = "smb347",
1314 },1314 },
1315 .probe = smb347_probe,1315 .probe = smb347_probe,
1316 .remove = __devexit_p(smb347_remove),1316 .remove = smb347_remove,
1317 .id_table = smb347_id,1317 .id_table = smb347_id,
1318};1318};
1319 1319
drivers/power/tosa_battery.c+3−3
@@ -342,7 +342,7 @@ static int tosa_bat_resume(struct platform_device *dev) · 341 unmodified lines
342#define tosa_bat_resume NULL342#define tosa_bat_resume NULL
343#endif343#endif
344 344
345static int __devinit tosa_bat_probe(struct platform_device *dev)345static int tosa_bat_probe(struct platform_device *dev)
346{346{
347 int ret;347 int ret;
348 348
@@ -409,7 +409,7 @@ err_psy_reg_main: · 60 unmodified lines
409 return ret;409 return ret;
410}410}
411 411
412static int __devexit tosa_bat_remove(struct platform_device *dev)412static int tosa_bat_remove(struct platform_device *dev)
413{413{
414 free_irq(gpio_to_irq(TOSA_GPIO_JACKET_DETECT), &tosa_bat_jacket);414 free_irq(gpio_to_irq(TOSA_GPIO_JACKET_DETECT), &tosa_bat_jacket);
415 free_irq(gpio_to_irq(TOSA_GPIO_BAT1_CRG), &tosa_bat_jacket);415 free_irq(gpio_to_irq(TOSA_GPIO_BAT1_CRG), &tosa_bat_jacket);
@@ -433,7 +433,7 @@ static struct platform_driver tosa_bat_driver = { · 17 unmodified lines
433 .driver.name = "wm97xx-battery",433 .driver.name = "wm97xx-battery",
434 .driver.owner = THIS_MODULE,434 .driver.owner = THIS_MODULE,
435 .probe = tosa_bat_probe,435 .probe = tosa_bat_probe,
436 .remove = __devexit_p(tosa_bat_remove),436 .remove = tosa_bat_remove,
437 .suspend = tosa_bat_suspend,437 .suspend = tosa_bat_suspend,
438 .resume = tosa_bat_resume,438 .resume = tosa_bat_resume,
439};439};
drivers/power/wm831x_backup.c+3−3
@@ -161,7 +161,7 @@ static enum power_supply_property wm831x_backup_props[] = { · 160 unmodified lines
161 * Initialisation161 * Initialisation
162 *********************************************************************/162 *********************************************************************/
163 163
164static __devinit int wm831x_backup_probe(struct platform_device *pdev)164static int wm831x_backup_probe(struct platform_device *pdev)
165{165{
166 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);166 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
167 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;167 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@@ -207,7 +207,7 @@ err_kmalloc: · 39 unmodified lines
207 return ret;207 return ret;
208}208}
209 209
210static __devexit int wm831x_backup_remove(struct platform_device *pdev)210static int wm831x_backup_remove(struct platform_device *pdev)
211{211{
212 struct wm831x_backup *devdata = platform_get_drvdata(pdev);212 struct wm831x_backup *devdata = platform_get_drvdata(pdev);
213 213
@@ -220,7 +220,7 @@ static __devexit int wm831x_backup_remove(struct platform_device *pdev) · 6 unmodified lines
220 220
221static struct platform_driver wm831x_backup_driver = {221static struct platform_driver wm831x_backup_driver = {
222 .probe = wm831x_backup_probe,222 .probe = wm831x_backup_probe,
223 .remove = __devexit_p(wm831x_backup_remove),223 .remove = wm831x_backup_remove,
224 .driver = {224 .driver = {
225 .name = "wm831x-backup",225 .name = "wm831x-backup",
226 },226 },
drivers/power/wm831x_power.c+3−3
@@ -489,7 +489,7 @@ static irqreturn_t wm831x_pwr_src_irq(int irq, void *data) · 488 unmodified lines
489 return IRQ_HANDLED;489 return IRQ_HANDLED;
490}490}
491 491
492static __devinit int wm831x_power_probe(struct platform_device *pdev)492static int wm831x_power_probe(struct platform_device *pdev)
493{493{
494 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);494 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
495 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;495 struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@@ -625,7 +625,7 @@ err_kmalloc: · 129 unmodified lines
625 return ret;625 return ret;
626}626}
627 627
628static __devexit int wm831x_power_remove(struct platform_device *pdev)628static int wm831x_power_remove(struct platform_device *pdev)
629{629{
630 struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);630 struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
631 struct wm831x *wm831x = wm831x_power->wm831x;631 struct wm831x *wm831x = wm831x_power->wm831x;
@@ -654,7 +654,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev) · 22 unmodified lines
654 654
655static struct platform_driver wm831x_power_driver = {655static struct platform_driver wm831x_power_driver = {
656 .probe = wm831x_power_probe,656 .probe = wm831x_power_probe,
657 .remove = __devexit_p(wm831x_power_remove),657 .remove = wm831x_power_remove,
658 .driver = {658 .driver = {
659 .name = "wm831x-power",659 .name = "wm831x-power",
660 },660 },
drivers/power/wm8350_power.c+3−3
@@ -442,7 +442,7 @@ static void free_charger_irq(struct wm8350 *wm8350) · 441 unmodified lines
442 wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350);442 wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350);
443}443}
444 444
445static __devinit int wm8350_power_probe(struct platform_device *pdev)445static int wm8350_power_probe(struct platform_device *pdev)
446{446{
447 struct wm8350 *wm8350 = platform_get_drvdata(pdev);447 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
448 struct wm8350_power *power = &wm8350->power;448 struct wm8350_power *power = &wm8350->power;
@@ -501,7 +501,7 @@ battery_failed: · 52 unmodified lines
501 return ret;501 return ret;
502}502}
503 503
504static __devexit int wm8350_power_remove(struct platform_device *pdev)504static int wm8350_power_remove(struct platform_device *pdev)
505{505{
506 struct wm8350 *wm8350 = platform_get_drvdata(pdev);506 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
507 struct wm8350_power *power = &wm8350->power;507 struct wm8350_power *power = &wm8350->power;
@@ -516,7 +516,7 @@ static __devexit int wm8350_power_remove(struct platform_device *pdev) · 8 unmodified lines
516 516
517static struct platform_driver wm8350_power_driver = {517static struct platform_driver wm8350_power_driver = {
518 .probe = wm8350_power_probe,518 .probe = wm8350_power_probe,
519 .remove = __devexit_p(wm8350_power_remove),519 .remove = wm8350_power_remove,
520 .driver = {520 .driver = {
521 .name = "wm8350-power",521 .name = "wm8350-power",
522 },522 },
drivers/power/wm97xx_battery.c+3−3
@@ -162,7 +162,7 @@ static const struct dev_pm_ops wm97xx_bat_pm_ops = { · 161 unmodified lines
162};162};
163#endif163#endif
164 164
165static int __devinit wm97xx_bat_probe(struct platform_device *dev)165static int wm97xx_bat_probe(struct platform_device *dev)
166{166{
167 int ret = 0;167 int ret = 0;
168 int props = 1; /* POWER_SUPPLY_PROP_PRESENT */168 int props = 1; /* POWER_SUPPLY_PROP_PRESENT */
@@ -263,7 +263,7 @@ err: · 94 unmodified lines
263 return ret;263 return ret;
264}264}
265 265
266static int __devexit wm97xx_bat_remove(struct platform_device *dev)266static int wm97xx_bat_remove(struct platform_device *dev)
267{267{
268 struct wm97xx_pdata *wmdata = dev->dev.platform_data;268 struct wm97xx_pdata *wmdata = dev->dev.platform_data;
269 struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;269 struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
@@ -287,7 +287,7 @@ static struct platform_driver wm97xx_bat_driver = { · 17 unmodified lines
287#endif287#endif
288 },288 },
289 .probe = wm97xx_bat_probe,289 .probe = wm97xx_bat_probe,
290 .remove = __devexit_p(wm97xx_bat_remove),290 .remove = wm97xx_bat_remove,
291};291};
292 292
293module_platform_driver(wm97xx_bat_driver);293module_platform_driver(wm97xx_bat_driver);
drivers/power/z2_battery.c+3−3
@@ -180,7 +180,7 @@ static int z2_batt_ps_init(struct z2_charger *charger, int props) · 179 unmodified lines
180 return 0;180 return 0;
181}181}
182 182
183static int __devinit z2_batt_probe(struct i2c_client *client,183static int z2_batt_probe(struct i2c_client *client,
184 const struct i2c_device_id *id)184 const struct i2c_device_id *id)
185{185{
186 int ret = 0;186 int ret = 0;
@@ -251,7 +251,7 @@ err: · 64 unmodified lines
251 return ret;251 return ret;
252}252}
253 253
254static int __devexit z2_batt_remove(struct i2c_client *client)254static int z2_batt_remove(struct i2c_client *client)
255{255{
256 struct z2_charger *charger = i2c_get_clientdata(client);256 struct z2_charger *charger = i2c_get_clientdata(client);
257 struct z2_battery_info *info = charger->info;257 struct z2_battery_info *info = charger->info;
@@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = { · 55 unmodified lines
313 .pm = Z2_BATTERY_PM_OPS313 .pm = Z2_BATTERY_PM_OPS
314 },314 },
315 .probe = z2_batt_probe,315 .probe = z2_batt_probe,
316 .remove = __devexit_p(z2_batt_remove),316 .remove = z2_batt_remove,
317 .id_table = z2_batt_id,317 .id_table = z2_batt_id,
318};318};
319module_i2c_driver(z2_batt_driver);319module_i2c_driver(z2_batt_driver);
drivers/ptp/ptp_pch.c+2−2
@@ -557,7 +557,7 @@ static s32 pch_resume(struct pci_dev *pdev) · 556 unmodified lines
557#define pch_resume NULL557#define pch_resume NULL
558#endif558#endif
559 559
560static void __devexit pch_remove(struct pci_dev *pdev)560static void pch_remove(struct pci_dev *pdev)
561{561{
562 struct pch_dev *chip = pci_get_drvdata(pdev);562 struct pch_dev *chip = pci_get_drvdata(pdev);
563 563
@@ -581,7 +581,7 @@ static void __devexit pch_remove(struct pci_dev *pdev) · 17 unmodified lines
581 dev_info(&pdev->dev, "complete\n");581 dev_info(&pdev->dev, "complete\n");
582}582}
583 583
584static s32 __devinit584static s32
585pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)585pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
586{586{
587 s32 ret;587 s32 ret;
drivers/pwm/pwm-ab8500.c+3−3
@@ -90,7 +90,7 @@ static const struct pwm_ops ab8500_pwm_ops = { · 89 unmodified lines
90 .disable = ab8500_pwm_disable,90 .disable = ab8500_pwm_disable,
91};91};
92 92
93static int __devinit ab8500_pwm_probe(struct platform_device *pdev)93static int ab8500_pwm_probe(struct platform_device *pdev)
94{94{
95 struct ab8500_pwm_chip *ab8500;95 struct ab8500_pwm_chip *ab8500;
96 int err;96 int err;
@@ -122,7 +122,7 @@ static int __devinit ab8500_pwm_probe(struct platform_device *pdev) · 25 unmodified lines
122 return 0;122 return 0;
123}123}
124 124
125static int __devexit ab8500_pwm_remove(struct platform_device *pdev)125static int ab8500_pwm_remove(struct platform_device *pdev)
126{126{
127 struct ab8500_pwm_chip *ab8500 = platform_get_drvdata(pdev);127 struct ab8500_pwm_chip *ab8500 = platform_get_drvdata(pdev);
128 int err;128 int err;
@@ -143,7 +143,7 @@ static struct platform_driver ab8500_pwm_driver = { · 14 unmodified lines
143 .owner = THIS_MODULE,143 .owner = THIS_MODULE,
144 },144 },
145 .probe = ab8500_pwm_probe,145 .probe = ab8500_pwm_probe,
146 .remove = __devexit_p(ab8500_pwm_remove),146 .remove = ab8500_pwm_remove,
147};147};
148module_platform_driver(ab8500_pwm_driver);148module_platform_driver(ab8500_pwm_driver);
149 149
drivers/pwm/pwm-bfin.c+2−2
@@ -139,7 +139,7 @@ static int bfin_pwm_probe(struct platform_device *pdev) · 138 unmodified lines
139 return 0;139 return 0;
140}140}
141 141
142static int __devexit bfin_pwm_remove(struct platform_device *pdev)142static int bfin_pwm_remove(struct platform_device *pdev)
143{143{
144 struct bfin_pwm_chip *pwm = platform_get_drvdata(pdev);144 struct bfin_pwm_chip *pwm = platform_get_drvdata(pdev);
145 145
@@ -151,7 +151,7 @@ static struct platform_driver bfin_pwm_driver = { · 5 unmodified lines
151 .name = "bfin-pwm",151 .name = "bfin-pwm",
152 },152 },
153 .probe = bfin_pwm_probe,153 .probe = bfin_pwm_probe,
154 .remove = __devexit_p(bfin_pwm_remove),154 .remove = bfin_pwm_remove,
155};155};
156 156
157module_platform_driver(bfin_pwm_driver);157module_platform_driver(bfin_pwm_driver);
drivers/pwm/pwm-imx.c+3−3
@@ -231,7 +231,7 @@ static const struct of_device_id imx_pwm_dt_ids[] = { · 230 unmodified lines
231};231};
232MODULE_DEVICE_TABLE(of, imx_pwm_dt_ids);232MODULE_DEVICE_TABLE(of, imx_pwm_dt_ids);
233 233
234static int __devinit imx_pwm_probe(struct platform_device *pdev)234static int imx_pwm_probe(struct platform_device *pdev)
235{235{
236 const struct of_device_id *of_id =236 const struct of_device_id *of_id =
237 of_match_device(imx_pwm_dt_ids, &pdev->dev);237 of_match_device(imx_pwm_dt_ids, &pdev->dev);
@@ -290,7 +290,7 @@ static int __devinit imx_pwm_probe(struct platform_device *pdev) · 52 unmodified lines
290 return 0;290 return 0;
291}291}
292 292
293static int __devexit imx_pwm_remove(struct platform_device *pdev)293static int imx_pwm_remove(struct platform_device *pdev)
294{294{
295 struct imx_chip *imx;295 struct imx_chip *imx;
296 296
@@ -307,7 +307,7 @@ static struct platform_driver imx_pwm_driver = { · 10 unmodified lines
307 .of_match_table = of_match_ptr(imx_pwm_dt_ids),307 .of_match_table = of_match_ptr(imx_pwm_dt_ids),
308 },308 },
309 .probe = imx_pwm_probe,309 .probe = imx_pwm_probe,
310 .remove = __devexit_p(imx_pwm_remove),310 .remove = imx_pwm_remove,
311};311};
312 312
313module_platform_driver(imx_pwm_driver);313module_platform_driver(imx_pwm_driver);
drivers/pwm/pwm-jz4740.c+3−3
@@ -162,7 +162,7 @@ static const struct pwm_ops jz4740_pwm_ops = { · 161 unmodified lines
162 .owner = THIS_MODULE,162 .owner = THIS_MODULE,
163};163};
164 164
165static int __devinit jz4740_pwm_probe(struct platform_device *pdev)165static int jz4740_pwm_probe(struct platform_device *pdev)
166{166{
167 struct jz4740_pwm_chip *jz4740;167 struct jz4740_pwm_chip *jz4740;
168 int ret;168 int ret;
@@ -191,7 +191,7 @@ static int __devinit jz4740_pwm_probe(struct platform_device *pdev) · 22 unmodified lines
191 return 0;191 return 0;
192}192}
193 193
194static int __devexit jz4740_pwm_remove(struct platform_device *pdev)194static int jz4740_pwm_remove(struct platform_device *pdev)
195{195{
196 struct jz4740_pwm_chip *jz4740 = platform_get_drvdata(pdev);196 struct jz4740_pwm_chip *jz4740 = platform_get_drvdata(pdev);
197 int ret;197 int ret;
@@ -211,7 +211,7 @@ static struct platform_driver jz4740_pwm_driver = { · 13 unmodified lines
211 .owner = THIS_MODULE,211 .owner = THIS_MODULE,
212 },212 },
213 .probe = jz4740_pwm_probe,213 .probe = jz4740_pwm_probe,
214 .remove = __devexit_p(jz4740_pwm_remove),214 .remove = jz4740_pwm_remove,
215};215};
216module_platform_driver(jz4740_pwm_driver);216module_platform_driver(jz4740_pwm_driver);
217 217
drivers/pwm/pwm-lpc32xx.c+2−2
@@ -118,7 +118,7 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) · 117 unmodified lines
118 return 0;118 return 0;
119}119}
120 120
121static int __devexit lpc32xx_pwm_remove(struct platform_device *pdev)121static int lpc32xx_pwm_remove(struct platform_device *pdev)
122{122{
123 struct lpc32xx_pwm_chip *lpc32xx = platform_get_drvdata(pdev);123 struct lpc32xx_pwm_chip *lpc32xx = platform_get_drvdata(pdev);
124 124
@@ -138,7 +138,7 @@ static struct platform_driver lpc32xx_pwm_driver = { · 13 unmodified lines
138 .of_match_table = of_match_ptr(lpc32xx_pwm_dt_ids),138 .of_match_table = of_match_ptr(lpc32xx_pwm_dt_ids),
139 },139 },
140 .probe = lpc32xx_pwm_probe,140 .probe = lpc32xx_pwm_probe,
141 .remove = __devexit_p(lpc32xx_pwm_remove),141 .remove = lpc32xx_pwm_remove,
142};142};
143module_platform_driver(lpc32xx_pwm_driver);143module_platform_driver(lpc32xx_pwm_driver);
144 144
drivers/pwm/pwm-mxs.c+2−2
@@ -174,7 +174,7 @@ static int mxs_pwm_probe(struct platform_device *pdev) · 173 unmodified lines
174 return 0;174 return 0;
175}175}
176 176
177static int __devexit mxs_pwm_remove(struct platform_device *pdev)177static int mxs_pwm_remove(struct platform_device *pdev)
178{178{
179 struct mxs_pwm_chip *mxs = platform_get_drvdata(pdev);179 struct mxs_pwm_chip *mxs = platform_get_drvdata(pdev);
180 180
@@ -193,7 +193,7 @@ static struct platform_driver mxs_pwm_driver = { · 12 unmodified lines
193 .of_match_table = of_match_ptr(mxs_pwm_dt_ids),193 .of_match_table = of_match_ptr(mxs_pwm_dt_ids),
194 },194 },
195 .probe = mxs_pwm_probe,195 .probe = mxs_pwm_probe,
196 .remove = __devexit_p(mxs_pwm_remove),196 .remove = mxs_pwm_remove,
197};197};
198module_platform_driver(mxs_pwm_driver);198module_platform_driver(mxs_pwm_driver);
199 199
drivers/pwm/pwm-puv3.c+3−3
@@ -101,7 +101,7 @@ static const struct pwm_ops puv3_pwm_ops = { · 100 unmodified lines
101 .owner = THIS_MODULE,101 .owner = THIS_MODULE,
102};102};
103 103
104static int __devinit pwm_probe(struct platform_device *pdev)104static int pwm_probe(struct platform_device *pdev)
105{105{
106 struct puv3_pwm_chip *puv3;106 struct puv3_pwm_chip *puv3;
107 struct resource *r;107 struct resource *r;
@@ -142,7 +142,7 @@ static int __devinit pwm_probe(struct platform_device *pdev) · 34 unmodified lines
142 return 0;142 return 0;
143}143}
144 144
145static int __devexit pwm_remove(struct platform_device *pdev)145static int pwm_remove(struct platform_device *pdev)
146{146{
147 struct puv3_pwm_chip *puv3 = platform_get_drvdata(pdev);147 struct puv3_pwm_chip *puv3 = platform_get_drvdata(pdev);
148 148
@@ -154,7 +154,7 @@ static struct platform_driver puv3_pwm_driver = { · 5 unmodified lines
154 .name = "PKUnity-v3-PWM",154 .name = "PKUnity-v3-PWM",
155 },155 },
156 .probe = pwm_probe,156 .probe = pwm_probe,
157 .remove = __devexit_p(pwm_remove),157 .remove = pwm_remove,
158};158};
159module_platform_driver(puv3_pwm_driver);159module_platform_driver(puv3_pwm_driver);
160 160
drivers/pwm/pwm-pxa.c+3−3
@@ -135,7 +135,7 @@ static struct pwm_ops pxa_pwm_ops = { · 134 unmodified lines
135 .owner = THIS_MODULE,135 .owner = THIS_MODULE,
136};136};
137 137
138static int __devinit pwm_probe(struct platform_device *pdev)138static int pwm_probe(struct platform_device *pdev)
139{139{
140 const struct platform_device_id *id = platform_get_device_id(pdev);140 const struct platform_device_id *id = platform_get_device_id(pdev);
141 struct pxa_pwm_chip *pwm;141 struct pxa_pwm_chip *pwm;
@@ -179,7 +179,7 @@ static int __devinit pwm_probe(struct platform_device *pdev) · 37 unmodified lines
179 return 0;179 return 0;
180}180}
181 181
182static int __devexit pwm_remove(struct platform_device *pdev)182static int pwm_remove(struct platform_device *pdev)
183{183{
184 struct pxa_pwm_chip *chip;184 struct pxa_pwm_chip *chip;
185 185
@@ -196,7 +196,7 @@ static struct platform_driver pwm_driver = { · 10 unmodified lines
196 .owner = THIS_MODULE,196 .owner = THIS_MODULE,
197 },197 },
198 .probe = pwm_probe,198 .probe = pwm_probe,
199 .remove = __devexit_p(pwm_remove),199 .remove = pwm_remove,
200 .id_table = pwm_id_table,200 .id_table = pwm_id_table,
201};201};
202 202
drivers/pwm/pwm-samsung.c+2−2
@@ -273,7 +273,7 @@ static int s3c_pwm_probe(struct platform_device *pdev) · 272 unmodified lines
273 return ret;273 return ret;
274}274}
275 275
276static int __devexit s3c_pwm_remove(struct platform_device *pdev)276static int s3c_pwm_remove(struct platform_device *pdev)
277{277{
278 struct s3c_chip *s3c = platform_get_drvdata(pdev);278 struct s3c_chip *s3c = platform_get_drvdata(pdev);
279 int err;279 int err;
@@ -327,7 +327,7 @@ static struct platform_driver s3c_pwm_driver = { · 47 unmodified lines
327 .owner = THIS_MODULE,327 .owner = THIS_MODULE,
328 },328 },
329 .probe = s3c_pwm_probe,329 .probe = s3c_pwm_probe,
330 .remove = __devexit_p(s3c_pwm_remove),330 .remove = s3c_pwm_remove,
331 .suspend = s3c_pwm_suspend,331 .suspend = s3c_pwm_suspend,
332 .resume = s3c_pwm_resume,332 .resume = s3c_pwm_resume,
333};333};
drivers/pwm/pwm-tegra.c+2−2
@@ -210,7 +210,7 @@ static int tegra_pwm_probe(struct platform_device *pdev) · 209 unmodified lines
210 return 0;210 return 0;
211}211}
212 212
213static int __devexit tegra_pwm_remove(struct platform_device *pdev)213static int tegra_pwm_remove(struct platform_device *pdev)
214{214{
215 struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);215 struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);
216 int i;216 int i;
@@ -249,7 +249,7 @@ static struct platform_driver tegra_pwm_driver = { · 32 unmodified lines
249 .of_match_table = of_match_ptr(tegra_pwm_of_match),249 .of_match_table = of_match_ptr(tegra_pwm_of_match),
250 },250 },
251 .probe = tegra_pwm_probe,251 .probe = tegra_pwm_probe,
252 .remove = __devexit_p(tegra_pwm_remove),252 .remove = tegra_pwm_remove,
253};253};
254 254
255module_platform_driver(tegra_pwm_driver);255module_platform_driver(tegra_pwm_driver);
drivers/pwm/pwm-tiecap.c+3−3
@@ -184,7 +184,7 @@ static const struct pwm_ops ecap_pwm_ops = { · 183 unmodified lines
184 .owner = THIS_MODULE,184 .owner = THIS_MODULE,
185};185};
186 186
187static int __devinit ecap_pwm_probe(struct platform_device *pdev)187static int ecap_pwm_probe(struct platform_device *pdev)
188{188{
189 int ret;189 int ret;
190 struct resource *r;190 struct resource *r;
@@ -235,7 +235,7 @@ static int __devinit ecap_pwm_probe(struct platform_device *pdev) · 44 unmodified lines
235 return 0;235 return 0;
236}236}
237 237
238static int __devexit ecap_pwm_remove(struct platform_device *pdev)238static int ecap_pwm_remove(struct platform_device *pdev)
239{239{
240 struct ecap_pwm_chip *pc = platform_get_drvdata(pdev);240 struct ecap_pwm_chip *pc = platform_get_drvdata(pdev);
241 241
@@ -249,7 +249,7 @@ static struct platform_driver ecap_pwm_driver = { · 7 unmodified lines
249 .name = "ecap",249 .name = "ecap",
250 },250 },
251 .probe = ecap_pwm_probe,251 .probe = ecap_pwm_probe,
252 .remove = __devexit_p(ecap_pwm_remove),252 .remove = ecap_pwm_remove,
253};253};
254 254
255module_platform_driver(ecap_pwm_driver);255module_platform_driver(ecap_pwm_driver);
drivers/pwm/pwm-tiehrpwm.c+3−3
@@ -392,7 +392,7 @@ static const struct pwm_ops ehrpwm_pwm_ops = { · 391 unmodified lines
392 .owner = THIS_MODULE,392 .owner = THIS_MODULE,
393};393};
394 394
395static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev)395static int ehrpwm_pwm_probe(struct platform_device *pdev)
396{396{
397 int ret;397 int ret;
398 struct resource *r;398 struct resource *r;
@@ -443,7 +443,7 @@ static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev) · 44 unmodified lines
443 return 0;443 return 0;
444}444}
445 445
446static int __devexit ehrpwm_pwm_remove(struct platform_device *pdev)446static int ehrpwm_pwm_remove(struct platform_device *pdev)
447{447{
448 struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);448 struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
449 449
@@ -457,7 +457,7 @@ static struct platform_driver ehrpwm_pwm_driver = { · 7 unmodified lines
457 .name = "ehrpwm",457 .name = "ehrpwm",
458 },458 },
459 .probe = ehrpwm_pwm_probe,459 .probe = ehrpwm_pwm_probe,
460 .remove = __devexit_p(ehrpwm_pwm_remove),460 .remove = ehrpwm_pwm_remove,
461};461};
462 462
463module_platform_driver(ehrpwm_pwm_driver);463module_platform_driver(ehrpwm_pwm_driver);
drivers/pwm/pwm-twl6030.c+1−1
@@ -176,7 +176,7 @@ static struct platform_driver twl6030_pwm_driver = { · 175 unmodified lines
176 .name = "twl6030-pwm",176 .name = "twl6030-pwm",
177 },177 },
178 .probe = twl6030_pwm_probe,178 .probe = twl6030_pwm_probe,
179 .remove = __devexit_p(twl6030_pwm_remove),179 .remove = twl6030_pwm_remove,
180};180};
181module_platform_driver(twl6030_pwm_driver);181module_platform_driver(twl6030_pwm_driver);
182 182
drivers/rapidio/devices/tsi721.c+2−2
@@ -2202,7 +2202,7 @@ static void tsi721_disable_ints(struct tsi721_device *priv) · 2201 unmodified lines
2202 *2202 *
2203 * Configures Tsi721 as RapidIO master port.2203 * Configures Tsi721 as RapidIO master port.
2204 */2204 */
2205static int __devinit tsi721_setup_mport(struct tsi721_device *priv)2205static int tsi721_setup_mport(struct tsi721_device *priv)
2206{2206{
2207 struct pci_dev *pdev = priv->pdev;2207 struct pci_dev *pdev = priv->pdev;
2208 int err = 0;2208 int err = 0;
@@ -2302,7 +2302,7 @@ err_exit: · 93 unmodified lines
2302 return err;2302 return err;
2303}2303}
2304 2304
2305static int __devinit tsi721_probe(struct pci_dev *pdev,2305static int tsi721_probe(struct pci_dev *pdev,
2306 const struct pci_device_id *id)2306 const struct pci_device_id *id)
2307{2307{
2308 struct tsi721_device *priv;2308 struct tsi721_device *priv;
drivers/rapidio/devices/tsi721.h+1−1
@@ -846,7 +846,7 @@ struct tsi721_device { · 845 unmodified lines
846 846
847#ifdef CONFIG_RAPIDIO_DMA_ENGINE847#ifdef CONFIG_RAPIDIO_DMA_ENGINE
848extern void tsi721_bdma_handler(struct tsi721_bdma_chan *bdma_chan);848extern void tsi721_bdma_handler(struct tsi721_bdma_chan *bdma_chan);
849extern int __devinit tsi721_register_dma(struct tsi721_device *priv);849extern int tsi721_register_dma(struct tsi721_device *priv);
850#endif850#endif
851 851
852#endif852#endif
drivers/rapidio/devices/tsi721_dma.c+1−1
@@ -765,7 +765,7 @@ static int tsi721_device_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd, · 764 unmodified lines
765 return 0;765 return 0;
766}766}
767 767
768int __devinit tsi721_register_dma(struct tsi721_device *priv)768int tsi721_register_dma(struct tsi721_device *priv)
769{769{
770 int i;770 int i;
771 int nr_channels = TSI721_DMA_MAXCH;771 int nr_channels = TSI721_DMA_MAXCH;
drivers/rapidio/rio-scan.c+7−7
@@ -371,7 +371,7 @@ static void rio_switch_init(struct rio_dev *rdev, int do_enum) · 370 unmodified lines
371 * device to the RIO device list. Creates the generic sysfs nodes371 * device to the RIO device list. Creates the generic sysfs nodes
372 * for an RIO device.372 * for an RIO device.
373 */373 */
374static int __devinit rio_add_device(struct rio_dev *rdev)374static int rio_add_device(struct rio_dev *rdev)
375{375{
376 int err;376 int err;
377 377
@@ -463,7 +463,7 @@ inline int rio_enable_rx_tx_port(struct rio_mport *port, · 85 unmodified lines
463 * to a RIO device on success or NULL on failure.463 * to a RIO device on success or NULL on failure.
464 *464 *
465 */465 */
466static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,466static struct rio_dev *rio_setup_device(struct rio_net *net,
467 struct rio_mport *port, u16 destid,467 struct rio_mport *port, u16 destid,
468 u8 hopcount, int do_enum)468 u8 hopcount, int do_enum)
469{469{
@@ -837,7 +837,7 @@ static u16 rio_get_host_deviceid_lock(struct rio_mport *port, u8 hopcount) · 367 unmodified lines
837 * Recursively enumerates a RIO network. Transactions are sent via the837 * Recursively enumerates a RIO network. Transactions are sent via the
838 * master port passed in @port.838 * master port passed in @port.
839 */839 */
840static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,840static int rio_enum_peer(struct rio_net *net, struct rio_mport *port,
841 u8 hopcount, struct rio_dev *prev, int prev_port)841 u8 hopcount, struct rio_dev *prev, int prev_port)
842{842{
843 struct rio_dev *rdev;843 struct rio_dev *rdev;
@@ -1044,7 +1044,7 @@ static int rio_enum_complete(struct rio_mport *port) · 200 unmodified lines
1044 * Recursively discovers a RIO network. Transactions are sent via the1044 * Recursively discovers a RIO network. Transactions are sent via the
1045 * master port passed in @port.1045 * master port passed in @port.
1046 */1046 */
1047static int __devinit1047static int
1048rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,1048rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
1049 u8 hopcount, struct rio_dev *prev, int prev_port)1049 u8 hopcount, struct rio_dev *prev, int prev_port)
1050{1050{
@@ -1151,7 +1151,7 @@ static int rio_mport_is_active(struct rio_mport *port) · 100 unmodified lines
1151 * network list of associated master ports. Returns a1151 * network list of associated master ports. Returns a
1152 * RIO network pointer on success or %NULL on failure.1152 * RIO network pointer on success or %NULL on failure.
1153 */1153 */
1154static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port,1154static struct rio_net *rio_alloc_net(struct rio_mport *port,
1155 int do_enum, u16 start)1155 int do_enum, u16 start)
1156{1156{
1157 struct rio_net *net;1157 struct rio_net *net;
@@ -1266,7 +1266,7 @@ static void rio_pw_enable(struct rio_mport *port, int enable) · 108 unmodified lines
1266 * link, then start recursive peer enumeration. Returns %0 if1266 * link, then start recursive peer enumeration. Returns %0 if
1267 * enumeration succeeds or %-EBUSY if enumeration fails.1267 * enumeration succeeds or %-EBUSY if enumeration fails.
1268 */1268 */
1269int __devinit rio_enum_mport(struct rio_mport *mport)1269int rio_enum_mport(struct rio_mport *mport)
1270{1270{
1271 struct rio_net *net = NULL;1271 struct rio_net *net = NULL;
1272 int rc = 0;1272 int rc = 0;
@@ -1369,7 +1369,7 @@ static void rio_build_route_tables(struct rio_net *net) · 96 unmodified lines
1369 * peer discovery. Returns %0 if discovery succeeds or %-EBUSY1369 * peer discovery. Returns %0 if discovery succeeds or %-EBUSY
1370 * on failure.1370 * on failure.
1371 */1371 */
1372int __devinit rio_disc_mport(struct rio_mport *mport)1372int rio_disc_mport(struct rio_mport *mport)
1373{1373{
1374 struct rio_net *net = NULL;1374 struct rio_net *net = NULL;
1375 unsigned long to_end;1375 unsigned long to_end;
drivers/rapidio/rio.c+3−3
@@ -1250,7 +1250,7 @@ static void rio_fixup_device(struct rio_dev *dev) · 1249 unmodified lines
1250{1250{
1251}1251}
1252 1252
1253static int __devinit rio_init(void)1253static int rio_init(void)
1254{1254{
1255 struct rio_dev *dev = NULL;1255 struct rio_dev *dev = NULL;
1256 1256
@@ -1267,7 +1267,7 @@ struct rio_disc_work { · 10 unmodified lines
1267 struct rio_mport *mport;1267 struct rio_mport *mport;
1268};1268};
1269 1269
1270static void __devinit disc_work_handler(struct work_struct *_work)1270static void disc_work_handler(struct work_struct *_work)
1271{1271{
1272 struct rio_disc_work *work;1272 struct rio_disc_work *work;
1273 1273
@@ -1277,7 +1277,7 @@ static void __devinit disc_work_handler(struct work_struct *_work) · 3 unmodified lines
1277 rio_disc_mport(work->mport);1277 rio_disc_mport(work->mport);
1278}1278}
1279 1279
1280int __devinit rio_init_mports(void)1280int rio_init_mports(void)
1281{1281{
1282 struct rio_mport *port;1282 struct rio_mport *port;
1283 struct rio_disc_work *work;1283 struct rio_disc_work *work;
drivers/video/backlight/adp5520_bl.c+3−3
@@ -282,7 +282,7 @@ static const struct attribute_group adp5520_bl_attr_group = { · 281 unmodified lines
282 .attrs = adp5520_bl_attributes,282 .attrs = adp5520_bl_attributes,
283};283};
284 284
285static int __devinit adp5520_bl_probe(struct platform_device *pdev)285static int adp5520_bl_probe(struct platform_device *pdev)
286{286{
287 struct backlight_properties props;287 struct backlight_properties props;
288 struct backlight_device *bl;288 struct backlight_device *bl;
@@ -333,7 +333,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) · 44 unmodified lines
333 return ret;333 return ret;
334}334}
335 335
336static int __devexit adp5520_bl_remove(struct platform_device *pdev)336static int adp5520_bl_remove(struct platform_device *pdev)
337{337{
338 struct backlight_device *bl = platform_get_drvdata(pdev);338 struct backlight_device *bl = platform_get_drvdata(pdev);
339 struct adp5520_bl *data = bl_get_data(bl);339 struct adp5520_bl *data = bl_get_data(bl);
@@ -375,7 +375,7 @@ static struct platform_driver adp5520_bl_driver = { · 35 unmodified lines
375 .owner = THIS_MODULE,375 .owner = THIS_MODULE,
376 },376 },
377 .probe = adp5520_bl_probe,377 .probe = adp5520_bl_probe,
378 .remove = __devexit_p(adp5520_bl_remove),378 .remove = adp5520_bl_remove,
379 .suspend = adp5520_bl_suspend,379 .suspend = adp5520_bl_suspend,
380 .resume = adp5520_bl_resume,380 .resume = adp5520_bl_resume,
381};381};
drivers/video/backlight/adp8860_bl.c+7−7
@@ -213,7 +213,7 @@ static int adp8860_led_setup(struct adp8860_led *led) · 212 unmodified lines
213 return ret;213 return ret;
214}214}
215 215
216static int __devinit adp8860_led_probe(struct i2c_client *client)216static int adp8860_led_probe(struct i2c_client *client)
217{217{
218 struct adp8860_backlight_platform_data *pdata =218 struct adp8860_backlight_platform_data *pdata =
219 client->dev.platform_data;219 client->dev.platform_data;
@@ -295,7 +295,7 @@ static int __devinit adp8860_led_probe(struct i2c_client *client) · 75 unmodified lines
295 return ret;295 return ret;
296}296}
297 297
298static int __devexit adp8860_led_remove(struct i2c_client *client)298static int adp8860_led_remove(struct i2c_client *client)
299{299{
300 struct adp8860_backlight_platform_data *pdata =300 struct adp8860_backlight_platform_data *pdata =
301 client->dev.platform_data;301 client->dev.platform_data;
@@ -310,12 +310,12 @@ static int __devexit adp8860_led_remove(struct i2c_client *client) · 8 unmodified lines
310 return 0;310 return 0;
311}311}
312#else312#else
313static int __devinit adp8860_led_probe(struct i2c_client *client)313static int adp8860_led_probe(struct i2c_client *client)
314{314{
315 return 0;315 return 0;
316}316}
317 317
318static int __devexit adp8860_led_remove(struct i2c_client *client)318static int adp8860_led_remove(struct i2c_client *client)
319{319{
320 return 0;320 return 0;
321}321}
@@ -650,7 +650,7 @@ static const struct attribute_group adp8860_bl_attr_group = { · 328 unmodified lines
650 .attrs = adp8860_bl_attributes,650 .attrs = adp8860_bl_attributes,
651};651};
652 652
653static int __devinit adp8860_probe(struct i2c_client *client,653static int adp8860_probe(struct i2c_client *client,
654 const struct i2c_device_id *id)654 const struct i2c_device_id *id)
655{655{
656 struct backlight_device *bl;656 struct backlight_device *bl;
@@ -755,7 +755,7 @@ out1: · 98 unmodified lines
755 return ret;755 return ret;
756}756}
757 757
758static int __devexit adp8860_remove(struct i2c_client *client)758static int adp8860_remove(struct i2c_client *client)
759{759{
760 struct adp8860_bl *data = i2c_get_clientdata(client);760 struct adp8860_bl *data = i2c_get_clientdata(client);
761 761
@@ -805,7 +805,7 @@ static struct i2c_driver adp8860_driver = { · 43 unmodified lines
805 .name = KBUILD_MODNAME,805 .name = KBUILD_MODNAME,
806 },806 },
807 .probe = adp8860_probe,807 .probe = adp8860_probe,
808 .remove = __devexit_p(adp8860_remove),808 .remove = adp8860_remove,
809 .suspend = adp8860_i2c_suspend,809 .suspend = adp8860_i2c_suspend,
810 .resume = adp8860_i2c_resume,810 .resume = adp8860_i2c_resume,
811 .id_table = adp8860_id,811 .id_table = adp8860_id,
drivers/video/backlight/adp8870_bl.c+7−7
@@ -235,7 +235,7 @@ static int adp8870_led_setup(struct adp8870_led *led) · 234 unmodified lines
235 return ret;235 return ret;
236}236}
237 237
238static int __devinit adp8870_led_probe(struct i2c_client *client)238static int adp8870_led_probe(struct i2c_client *client)
239{239{
240 struct adp8870_backlight_platform_data *pdata =240 struct adp8870_backlight_platform_data *pdata =
241 client->dev.platform_data;241 client->dev.platform_data;
@@ -320,7 +320,7 @@ static int __devinit adp8870_led_probe(struct i2c_client *client) · 78 unmodified lines
320 return ret;320 return ret;
321}321}
322 322
323static int __devexit adp8870_led_remove(struct i2c_client *client)323static int adp8870_led_remove(struct i2c_client *client)
324{324{
325 struct adp8870_backlight_platform_data *pdata =325 struct adp8870_backlight_platform_data *pdata =
326 client->dev.platform_data;326 client->dev.platform_data;
@@ -335,12 +335,12 @@ static int __devexit adp8870_led_remove(struct i2c_client *client) · 8 unmodified lines
335 return 0;335 return 0;
336}336}
337#else337#else
338static int __devinit adp8870_led_probe(struct i2c_client *client)338static int adp8870_led_probe(struct i2c_client *client)
339{339{
340 return 0;340 return 0;
341}341}
342 342
343static int __devexit adp8870_led_remove(struct i2c_client *client)343static int adp8870_led_remove(struct i2c_client *client)
344{344{
345 return 0;345 return 0;
346}346}
@@ -839,7 +839,7 @@ static const struct attribute_group adp8870_bl_attr_group = { · 492 unmodified lines
839 .attrs = adp8870_bl_attributes,839 .attrs = adp8870_bl_attributes,
840};840};
841 841
842static int __devinit adp8870_probe(struct i2c_client *client,842static int adp8870_probe(struct i2c_client *client,
843 const struct i2c_device_id *id)843 const struct i2c_device_id *id)
844{844{
845 struct backlight_properties props;845 struct backlight_properties props;
@@ -929,7 +929,7 @@ out1: · 83 unmodified lines
929 return ret;929 return ret;
930}930}
931 931
932static int __devexit adp8870_remove(struct i2c_client *client)932static int adp8870_remove(struct i2c_client *client)
933{933{
934 struct adp8870_bl *data = i2c_get_clientdata(client);934 struct adp8870_bl *data = i2c_get_clientdata(client);
935 935
@@ -977,7 +977,7 @@ static struct i2c_driver adp8870_driver = { · 41 unmodified lines
977 .name = KBUILD_MODNAME,977 .name = KBUILD_MODNAME,
978 },978 },
979 .probe = adp8870_probe,979 .probe = adp8870_probe,
980 .remove = __devexit_p(adp8870_remove),980 .remove = adp8870_remove,
981 .suspend = adp8870_i2c_suspend,981 .suspend = adp8870_i2c_suspend,
982 .resume = adp8870_i2c_resume,982 .resume = adp8870_i2c_resume,
983 .id_table = adp8870_id,983 .id_table = adp8870_id,
drivers/video/backlight/ams369fg06.c+3−3
@@ -474,7 +474,7 @@ static const struct backlight_ops ams369fg06_backlight_ops = { · 473 unmodified lines
474 .update_status = ams369fg06_set_brightness,474 .update_status = ams369fg06_set_brightness,
475};475};
476 476
477static int __devinit ams369fg06_probe(struct spi_device *spi)477static int ams369fg06_probe(struct spi_device *spi)
478{478{
479 int ret = 0;479 int ret = 0;
480 struct ams369fg06 *lcd = NULL;480 struct ams369fg06 *lcd = NULL;
@@ -548,7 +548,7 @@ out_lcd_unregister: · 67 unmodified lines
548 return ret;548 return ret;
549}549}
550 550
551static int __devexit ams369fg06_remove(struct spi_device *spi)551static int ams369fg06_remove(struct spi_device *spi)
552{552{
553 struct ams369fg06 *lcd = dev_get_drvdata(&spi->dev);553 struct ams369fg06 *lcd = dev_get_drvdata(&spi->dev);
554 554
@@ -617,7 +617,7 @@ static struct spi_driver ams369fg06_driver = { · 62 unmodified lines
617 .owner = THIS_MODULE,617 .owner = THIS_MODULE,
618 },618 },
619 .probe = ams369fg06_probe,619 .probe = ams369fg06_probe,
620 .remove = __devexit_p(ams369fg06_remove),620 .remove = ams369fg06_remove,
621 .shutdown = ams369fg06_shutdown,621 .shutdown = ams369fg06_shutdown,
622 .suspend = ams369fg06_suspend,622 .suspend = ams369fg06_suspend,
623 .resume = ams369fg06_resume,623 .resume = ams369fg06_resume,
drivers/video/backlight/apple_bl.c+2−2
@@ -137,7 +137,7 @@ static const struct hw_data nvidia_chipset_data = { · 136 unmodified lines
137 .set_brightness = nvidia_chipset_set_brightness,137 .set_brightness = nvidia_chipset_set_brightness,
138};138};
139 139
140static int __devinit apple_bl_add(struct acpi_device *dev)140static int apple_bl_add(struct acpi_device *dev)
141{141{
142 struct backlight_properties props;142 struct backlight_properties props;
143 struct pci_dev *host;143 struct pci_dev *host;
@@ -196,7 +196,7 @@ static int __devinit apple_bl_add(struct acpi_device *dev) · 52 unmodified lines
196 return 0;196 return 0;
197}197}
198 198
199static int __devexit apple_bl_remove(struct acpi_device *dev, int type)199static int apple_bl_remove(struct acpi_device *dev, int type)
200{200{
201 backlight_device_unregister(apple_backlight_device);201 backlight_device_unregister(apple_backlight_device);
202 202
drivers/video/backlight/corgi_lcd.c+3−3
@@ -529,7 +529,7 @@ static int setup_gpio_backlight(struct corgi_lcd *lcd, · 528 unmodified lines
529 return 0;529 return 0;
530}530}
531 531
532static int __devinit corgi_lcd_probe(struct spi_device *spi)532static int corgi_lcd_probe(struct spi_device *spi)
533{533{
534 struct backlight_properties props;534 struct backlight_properties props;
535 struct corgi_lcd_platform_data *pdata = spi->dev.platform_data;535 struct corgi_lcd_platform_data *pdata = spi->dev.platform_data;
@@ -590,7 +590,7 @@ err_unregister_lcd: · 54 unmodified lines
590 return ret;590 return ret;
591}591}
592 592
593static int __devexit corgi_lcd_remove(struct spi_device *spi)593static int corgi_lcd_remove(struct spi_device *spi)
594{594{
595 struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);595 struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
596 596
@@ -611,7 +611,7 @@ static struct spi_driver corgi_lcd_driver = { · 14 unmodified lines
611 .owner = THIS_MODULE,611 .owner = THIS_MODULE,
612 },612 },
613 .probe = corgi_lcd_probe,613 .probe = corgi_lcd_probe,
614 .remove = __devexit_p(corgi_lcd_remove),614 .remove = corgi_lcd_remove,
615 .suspend = corgi_lcd_suspend,615 .suspend = corgi_lcd_suspend,
616 .resume = corgi_lcd_resume,616 .resume = corgi_lcd_resume,
617};617};
drivers/video/backlight/ep93xx_bl.c+1−1
@@ -141,7 +141,7 @@ static struct platform_driver ep93xxbl_driver = { · 140 unmodified lines
141 .owner = THIS_MODULE,141 .owner = THIS_MODULE,
142 },142 },
143 .probe = ep93xxbl_probe,143 .probe = ep93xxbl_probe,
144 .remove = __devexit_p(ep93xxbl_remove),144 .remove = ep93xxbl_remove,
145 .suspend = ep93xxbl_suspend,145 .suspend = ep93xxbl_suspend,
146 .resume = ep93xxbl_resume,146 .resume = ep93xxbl_resume,
147};147};
drivers/video/backlight/hp680_bl.c+1−1
@@ -103,7 +103,7 @@ static const struct backlight_ops hp680bl_ops = { · 102 unmodified lines
103 .update_status = hp680bl_set_intensity,103 .update_status = hp680bl_set_intensity,
104};104};
105 105
106static int __devinit hp680bl_probe(struct platform_device *pdev)106static int hp680bl_probe(struct platform_device *pdev)
107{107{
108 struct backlight_properties props;108 struct backlight_properties props;
109 struct backlight_device *bd;109 struct backlight_device *bd;
drivers/video/backlight/ili9320.c+2−2
@@ -171,7 +171,7 @@ static struct lcd_ops ili9320_ops = { · 170 unmodified lines
171 .set_power = ili9320_set_power,171 .set_power = ili9320_set_power,
172};172};
173 173
174static void __devinit ili9320_setup_spi(struct ili9320 *ili,174static void ili9320_setup_spi(struct ili9320 *ili,
175 struct spi_device *dev)175 struct spi_device *dev)
176{176{
177 struct ili9320_spi *spi = &ili->access.spi;177 struct ili9320_spi *spi = &ili->access.spi;
@@ -197,7 +197,7 @@ static void __devinit ili9320_setup_spi(struct ili9320 *ili, · 19 unmodified lines
197 spi_message_add_tail(&spi->xfer[1], &spi->message);197 spi_message_add_tail(&spi->xfer[1], &spi->message);
198}198}
199 199
200int __devinit ili9320_probe_spi(struct spi_device *spi,200int ili9320_probe_spi(struct spi_device *spi,
201 struct ili9320_client *client)201 struct ili9320_client *client)
202{202{
203 struct ili9320_platdata *cfg = spi->dev.platform_data;203 struct ili9320_platdata *cfg = spi->dev.platform_data;
drivers/video/backlight/l4f00242t03.c+3−3
@@ -150,7 +150,7 @@ static struct lcd_ops l4f_ops = { · 149 unmodified lines
150 .get_power = l4f00242t03_lcd_power_get,150 .get_power = l4f00242t03_lcd_power_get,
151};151};
152 152
153static int __devinit l4f00242t03_probe(struct spi_device *spi)153static int l4f00242t03_probe(struct spi_device *spi)
154{154{
155 struct l4f00242t03_priv *priv;155 struct l4f00242t03_priv *priv;
156 struct l4f00242t03_pdata *pdata = spi->dev.platform_data;156 struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
@@ -230,7 +230,7 @@ err1: · 73 unmodified lines
230 return ret;230 return ret;
231}231}
232 232
233static int __devexit l4f00242t03_remove(struct spi_device *spi)233static int l4f00242t03_remove(struct spi_device *spi)
234{234{
235 struct l4f00242t03_priv *priv = dev_get_drvdata(&spi->dev);235 struct l4f00242t03_priv *priv = dev_get_drvdata(&spi->dev);
236 236
@@ -260,7 +260,7 @@ static struct spi_driver l4f00242t03_driver = { · 23 unmodified lines
260 .owner = THIS_MODULE,260 .owner = THIS_MODULE,
261 },261 },
262 .probe = l4f00242t03_probe,262 .probe = l4f00242t03_probe,
263 .remove = __devexit_p(l4f00242t03_remove),263 .remove = l4f00242t03_remove,
264 .shutdown = l4f00242t03_shutdown,264 .shutdown = l4f00242t03_shutdown,
265};265};
266 266
drivers/video/backlight/ld9040.c+2−2
@@ -788,7 +788,7 @@ out_free_regulator: · 787 unmodified lines
788 return ret;788 return ret;
789}789}
790 790
791static int __devexit ld9040_remove(struct spi_device *spi)791static int ld9040_remove(struct spi_device *spi)
792{792{
793 struct ld9040 *lcd = dev_get_drvdata(&spi->dev);793 struct ld9040 *lcd = dev_get_drvdata(&spi->dev);
794 794
@@ -847,7 +847,7 @@ static struct spi_driver ld9040_driver = { · 52 unmodified lines
847 .owner = THIS_MODULE,847 .owner = THIS_MODULE,
848 },848 },
849 .probe = ld9040_probe,849 .probe = ld9040_probe,
850 .remove = __devexit_p(ld9040_remove),850 .remove = ld9040_remove,
851 .shutdown = ld9040_shutdown,851 .shutdown = ld9040_shutdown,
852 .suspend = ld9040_suspend,852 .suspend = ld9040_suspend,
853 .resume = ld9040_resume,853 .resume = ld9040_resume,
drivers/video/backlight/lm3533_bl.c+4−4
@@ -257,7 +257,7 @@ static struct attribute_group lm3533_bl_attribute_group = { · 256 unmodified lines
257 .attrs = lm3533_bl_attributes257 .attrs = lm3533_bl_attributes
258};258};
259 259
260static int __devinit lm3533_bl_setup(struct lm3533_bl *bl,260static int lm3533_bl_setup(struct lm3533_bl *bl,
261 struct lm3533_bl_platform_data *pdata)261 struct lm3533_bl_platform_data *pdata)
262{262{
263 int ret;263 int ret;
@@ -269,7 +269,7 @@ static int __devinit lm3533_bl_setup(struct lm3533_bl *bl, · 5 unmodified lines
269 return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);269 return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
270}270}
271 271
272static int __devinit lm3533_bl_probe(struct platform_device *pdev)272static int lm3533_bl_probe(struct platform_device *pdev)
273{273{
274 struct lm3533 *lm3533;274 struct lm3533 *lm3533;
275 struct lm3533_bl_platform_data *pdata;275 struct lm3533_bl_platform_data *pdata;
@@ -351,7 +351,7 @@ err_unregister: · 75 unmodified lines
351 return ret;351 return ret;
352}352}
353 353
354static int __devexit lm3533_bl_remove(struct platform_device *pdev)354static int lm3533_bl_remove(struct platform_device *pdev)
355{355{
356 struct lm3533_bl *bl = platform_get_drvdata(pdev);356 struct lm3533_bl *bl = platform_get_drvdata(pdev);
357 struct backlight_device *bd = bl->bd;357 struct backlight_device *bd = bl->bd;
@@ -406,7 +406,7 @@ static struct platform_driver lm3533_bl_driver = { · 48 unmodified lines
406 .owner = THIS_MODULE,406 .owner = THIS_MODULE,
407 },407 },
408 .probe = lm3533_bl_probe,408 .probe = lm3533_bl_probe,
409 .remove = __devexit_p(lm3533_bl_remove),409 .remove = lm3533_bl_remove,
410 .shutdown = lm3533_bl_shutdown,410 .shutdown = lm3533_bl_shutdown,
411 .suspend = lm3533_bl_suspend,411 .suspend = lm3533_bl_suspend,
412 .resume = lm3533_bl_resume,412 .resume = lm3533_bl_resume,
drivers/video/backlight/lm3630_bl.c+4−4
@@ -55,7 +55,7 @@ struct lm3630_chip_data { · 54 unmodified lines
55};55};
56 56
57/* initialize chip */57/* initialize chip */
58static int __devinit lm3630_chip_init(struct lm3630_chip_data *pchip)58static int lm3630_chip_init(struct lm3630_chip_data *pchip)
59{59{
60 int ret;60 int ret;
61 unsigned int reg_val;61 unsigned int reg_val;
@@ -349,7 +349,7 @@ static const struct regmap_config lm3630_regmap = { · 287 unmodified lines
349 .max_register = REG_MAX,349 .max_register = REG_MAX,
350};350};
351 351
352static int __devinit lm3630_probe(struct i2c_client *client,352static int lm3630_probe(struct i2c_client *client,
353 const struct i2c_device_id *id)353 const struct i2c_device_id *id)
354{354{
355 struct lm3630_platform_data *pdata = client->dev.platform_data;355 struct lm3630_platform_data *pdata = client->dev.platform_data;
@@ -429,7 +429,7 @@ err_chip_init: · 73 unmodified lines
429 return ret;429 return ret;
430}430}
431 431
432static int __devexit lm3630_remove(struct i2c_client *client)432static int lm3630_remove(struct i2c_client *client)
433{433{
434 int ret;434 int ret;
435 struct lm3630_chip_data *pchip = i2c_get_clientdata(client);435 struct lm3630_chip_data *pchip = i2c_get_clientdata(client);
@@ -463,7 +463,7 @@ static struct i2c_driver lm3630_i2c_driver = { · 27 unmodified lines
463 .name = LM3630_NAME,463 .name = LM3630_NAME,
464 },464 },
465 .probe = lm3630_probe,465 .probe = lm3630_probe,
466 .remove = __devexit_p(lm3630_remove),466 .remove = lm3630_remove,
467 .id_table = lm3630_id,467 .id_table = lm3630_id,
468};468};
469 469
drivers/video/backlight/lm3639_bl.c+4−4
@@ -48,7 +48,7 @@ struct lm3639_chip_data { · 47 unmodified lines
48};48};
49 49
50/* initialize chip */50/* initialize chip */
51static int __devinit lm3639_chip_init(struct lm3639_chip_data *pchip)51static int lm3639_chip_init(struct lm3639_chip_data *pchip)
52{52{
53 int ret;53 int ret;
54 unsigned int reg_val;54 unsigned int reg_val;
@@ -299,7 +299,7 @@ static const struct regmap_config lm3639_regmap = { · 244 unmodified lines
299 .max_register = REG_MAX,299 .max_register = REG_MAX,
300};300};
301 301
302static int __devinit lm3639_probe(struct i2c_client *client,302static int lm3639_probe(struct i2c_client *client,
303 const struct i2c_device_id *id)303 const struct i2c_device_id *id)
304{304{
305 int ret;305 int ret;
@@ -397,7 +397,7 @@ err_out: · 91 unmodified lines
397 return ret;397 return ret;
398}398}
399 399
400static int __devexit lm3639_remove(struct i2c_client *client)400static int lm3639_remove(struct i2c_client *client)
401{401{
402 struct lm3639_chip_data *pchip = i2c_get_clientdata(client);402 struct lm3639_chip_data *pchip = i2c_get_clientdata(client);
403 403
@@ -425,7 +425,7 @@ static struct i2c_driver lm3639_i2c_driver = { · 21 unmodified lines
425 .name = LM3639_NAME,425 .name = LM3639_NAME,
426 },426 },
427 .probe = lm3639_probe,427 .probe = lm3639_probe,
428 .remove = __devexit_p(lm3639_remove),428 .remove = lm3639_remove,
429 .id_table = lm3639_id,429 .id_table = lm3639_id,
430};430};
431 431
drivers/video/backlight/lms283gf05.c+3−3
@@ -150,7 +150,7 @@ static struct lcd_ops lms_ops = { · 149 unmodified lines
150 .get_power = NULL,150 .get_power = NULL,
151};151};
152 152
153static int __devinit lms283gf05_probe(struct spi_device *spi)153static int lms283gf05_probe(struct spi_device *spi)
154{154{
155 struct lms283gf05_state *st;155 struct lms283gf05_state *st;
156 struct lms283gf05_pdata *pdata = spi->dev.platform_data;156 struct lms283gf05_pdata *pdata = spi->dev.platform_data;
@@ -193,7 +193,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi) · 36 unmodified lines
193 return 0;193 return 0;
194}194}
195 195
196static int __devexit lms283gf05_remove(struct spi_device *spi)196static int lms283gf05_remove(struct spi_device *spi)
197{197{
198 struct lms283gf05_state *st = dev_get_drvdata(&spi->dev);198 struct lms283gf05_state *st = dev_get_drvdata(&spi->dev);
199 199
@@ -208,7 +208,7 @@ static struct spi_driver lms283gf05_driver = { · 8 unmodified lines
208 .owner = THIS_MODULE,208 .owner = THIS_MODULE,
209 },209 },
210 .probe = lms283gf05_probe,210 .probe = lms283gf05_probe,
211 .remove = __devexit_p(lms283gf05_remove),211 .remove = lms283gf05_remove,
212};212};
213 213
214module_spi_driver(lms283gf05_driver);214module_spi_driver(lms283gf05_driver);
drivers/video/backlight/lp855x_bl.c+2−2
@@ -297,7 +297,7 @@ err_dev: · 296 unmodified lines
297 return ret;297 return ret;
298}298}
299 299
300static int __devexit lp855x_remove(struct i2c_client *cl)300static int lp855x_remove(struct i2c_client *cl)
301{301{
302 struct lp855x *lp = i2c_get_clientdata(cl);302 struct lp855x *lp = i2c_get_clientdata(cl);
303 303
@@ -324,7 +324,7 @@ static struct i2c_driver lp855x_driver = { · 20 unmodified lines
324 .name = "lp855x",324 .name = "lp855x",
325 },325 },
326 .probe = lp855x_probe,326 .probe = lp855x_probe,
327 .remove = __devexit_p(lp855x_remove),327 .remove = lp855x_remove,
328 .id_table = lp855x_ids,328 .id_table = lp855x_ids,
329};329};
330 330
drivers/video/backlight/ltv350qv.c+3−3
@@ -226,7 +226,7 @@ static struct lcd_ops ltv_ops = { · 225 unmodified lines
226 .set_power = ltv350qv_set_power,226 .set_power = ltv350qv_set_power,
227};227};
228 228
229static int __devinit ltv350qv_probe(struct spi_device *spi)229static int ltv350qv_probe(struct spi_device *spi)
230{230{
231 struct ltv350qv *lcd;231 struct ltv350qv *lcd;
232 struct lcd_device *ld;232 struct lcd_device *ld;
@@ -261,7 +261,7 @@ out_unregister: · 28 unmodified lines
261 return ret;261 return ret;
262}262}
263 263
264static int __devexit ltv350qv_remove(struct spi_device *spi)264static int ltv350qv_remove(struct spi_device *spi)
265{265{
266 struct ltv350qv *lcd = dev_get_drvdata(&spi->dev);266 struct ltv350qv *lcd = dev_get_drvdata(&spi->dev);
267 267
@@ -305,7 +305,7 @@ static struct spi_driver ltv350qv_driver = { · 37 unmodified lines
305 },305 },
306 306
307 .probe = ltv350qv_probe,307 .probe = ltv350qv_probe,
308 .remove = __devexit_p(ltv350qv_remove),308 .remove = ltv350qv_remove,
309 .shutdown = ltv350qv_shutdown,309 .shutdown = ltv350qv_shutdown,
310 .suspend = ltv350qv_suspend,310 .suspend = ltv350qv_suspend,
311 .resume = ltv350qv_resume,311 .resume = ltv350qv_resume,
drivers/video/backlight/max8925_bl.c+3−3
@@ -101,7 +101,7 @@ static const struct backlight_ops max8925_backlight_ops = { · 100 unmodified lines
101 .get_brightness = max8925_backlight_get_brightness,101 .get_brightness = max8925_backlight_get_brightness,
102};102};
103 103
104static int __devinit max8925_backlight_probe(struct platform_device *pdev)104static int max8925_backlight_probe(struct platform_device *pdev)
105{105{
106 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);106 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
107 struct max8925_backlight_pdata *pdata = pdev->dev.platform_data;107 struct max8925_backlight_pdata *pdata = pdev->dev.platform_data;
@@ -171,7 +171,7 @@ out: · 63 unmodified lines
171 return ret;171 return ret;
172}172}
173 173
174static int __devexit max8925_backlight_remove(struct platform_device *pdev)174static int max8925_backlight_remove(struct platform_device *pdev)
175{175{
176 struct backlight_device *bl = platform_get_drvdata(pdev);176 struct backlight_device *bl = platform_get_drvdata(pdev);
177 177
@@ -185,7 +185,7 @@ static struct platform_driver max8925_backlight_driver = { · 7 unmodified lines
185 .owner = THIS_MODULE,185 .owner = THIS_MODULE,
186 },186 },
187 .probe = max8925_backlight_probe,187 .probe = max8925_backlight_probe,
188 .remove = __devexit_p(max8925_backlight_remove),188 .remove = max8925_backlight_remove,
189};189};
190 190
191module_platform_driver(max8925_backlight_driver);191module_platform_driver(max8925_backlight_driver);
drivers/video/backlight/pcf50633-backlight.c+3−3
@@ -99,7 +99,7 @@ static const struct backlight_ops pcf50633_bl_ops = { · 98 unmodified lines
99 .options = BL_CORE_SUSPENDRESUME,99 .options = BL_CORE_SUSPENDRESUME,
100};100};
101 101
102static int __devinit pcf50633_bl_probe(struct platform_device *pdev)102static int pcf50633_bl_probe(struct platform_device *pdev)
103{103{
104 struct pcf50633_bl *pcf_bl;104 struct pcf50633_bl *pcf_bl;
105 struct device *parent = pdev->dev.parent;105 struct device *parent = pdev->dev.parent;
@@ -145,7 +145,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev) · 39 unmodified lines
145 return 0;145 return 0;
146}146}
147 147
148static int __devexit pcf50633_bl_remove(struct platform_device *pdev)148static int pcf50633_bl_remove(struct platform_device *pdev)
149{149{
150 struct pcf50633_bl *pcf_bl = platform_get_drvdata(pdev);150 struct pcf50633_bl *pcf_bl = platform_get_drvdata(pdev);
151 151
@@ -158,7 +158,7 @@ static int __devexit pcf50633_bl_remove(struct platform_device *pdev) · 6 unmodified lines
158 158
159static struct platform_driver pcf50633_bl_driver = {159static struct platform_driver pcf50633_bl_driver = {
160 .probe = pcf50633_bl_probe,160 .probe = pcf50633_bl_probe,
161 .remove = __devexit_p(pcf50633_bl_remove),161 .remove = pcf50633_bl_remove,
162 .driver = {162 .driver = {
163 .name = "pcf50633-backlight",163 .name = "pcf50633-backlight",
164 },164 },
drivers/video/backlight/platform_lcd.c+3−3
@@ -73,7 +73,7 @@ static struct lcd_ops platform_lcd_ops = { · 72 unmodified lines
73 .check_fb = platform_lcd_match,73 .check_fb = platform_lcd_match,
74};74};
75 75
76static int __devinit platform_lcd_probe(struct platform_device *pdev)76static int platform_lcd_probe(struct platform_device *pdev)
77{77{
78 struct plat_lcd_data *pdata;78 struct plat_lcd_data *pdata;
79 struct platform_lcd *plcd;79 struct platform_lcd *plcd;
@@ -112,7 +112,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) · 32 unmodified lines
112 return err;112 return err;
113}113}
114 114
115static int __devexit platform_lcd_remove(struct platform_device *pdev)115static int platform_lcd_remove(struct platform_device *pdev)
116{116{
117 struct platform_lcd *plcd = platform_get_drvdata(pdev);117 struct platform_lcd *plcd = platform_get_drvdata(pdev);
118 118
@@ -164,7 +164,7 @@ static struct platform_driver platform_lcd_driver = { · 45 unmodified lines
164 .of_match_table = of_match_ptr(platform_lcd_of_match),164 .of_match_table = of_match_ptr(platform_lcd_of_match),
165 },165 },
166 .probe = platform_lcd_probe,166 .probe = platform_lcd_probe,
167 .remove = __devexit_p(platform_lcd_remove),167 .remove = platform_lcd_remove,
168};168};
169 169
170module_platform_driver(platform_lcd_driver);170module_platform_driver(platform_lcd_driver);
drivers/video/backlight/s6e63m0.c+3−3
@@ -733,7 +733,7 @@ static ssize_t s6e63m0_sysfs_show_gamma_table(struct device *dev, · 732 unmodified lines
733static DEVICE_ATTR(gamma_table, 0444,733static DEVICE_ATTR(gamma_table, 0444,
734 s6e63m0_sysfs_show_gamma_table, NULL);734 s6e63m0_sysfs_show_gamma_table, NULL);
735 735
736static int __devinit s6e63m0_probe(struct spi_device *spi)736static int s6e63m0_probe(struct spi_device *spi)
737{737{
738 int ret = 0;738 int ret = 0;
739 struct s6e63m0 *lcd = NULL;739 struct s6e63m0 *lcd = NULL;
@@ -825,7 +825,7 @@ out_lcd_unregister: · 85 unmodified lines
825 return ret;825 return ret;
826}826}
827 827
828static int __devexit s6e63m0_remove(struct spi_device *spi)828static int s6e63m0_remove(struct spi_device *spi)
829{829{
830 struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);830 struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);
831 831
@@ -897,7 +897,7 @@ static struct spi_driver s6e63m0_driver = { · 65 unmodified lines
897 .owner = THIS_MODULE,897 .owner = THIS_MODULE,
898 },898 },
899 .probe = s6e63m0_probe,899 .probe = s6e63m0_probe,
900 .remove = __devexit_p(s6e63m0_remove),900 .remove = s6e63m0_remove,
901 .shutdown = s6e63m0_shutdown,901 .shutdown = s6e63m0_shutdown,
902 .suspend = s6e63m0_suspend,902 .suspend = s6e63m0_suspend,
903 .resume = s6e63m0_resume,903 .resume = s6e63m0_resume,
drivers/video/backlight/tdo24m.c+3−3
@@ -328,7 +328,7 @@ static struct lcd_ops tdo24m_ops = { · 327 unmodified lines
328 .set_mode = tdo24m_set_mode,328 .set_mode = tdo24m_set_mode,
329};329};
330 330
331static int __devinit tdo24m_probe(struct spi_device *spi)331static int tdo24m_probe(struct spi_device *spi)
332{332{
333 struct tdo24m *lcd;333 struct tdo24m *lcd;
334 struct spi_message *m;334 struct spi_message *m;
@@ -401,7 +401,7 @@ out_unregister: · 66 unmodified lines
401 return err;401 return err;
402}402}
403 403
404static int __devexit tdo24m_remove(struct spi_device *spi)404static int tdo24m_remove(struct spi_device *spi)
405{405{
406 struct tdo24m *lcd = dev_get_drvdata(&spi->dev);406 struct tdo24m *lcd = dev_get_drvdata(&spi->dev);
407 407
@@ -444,7 +444,7 @@ static struct spi_driver tdo24m_driver = { · 36 unmodified lines
444 .owner = THIS_MODULE,444 .owner = THIS_MODULE,
445 },445 },
446 .probe = tdo24m_probe,446 .probe = tdo24m_probe,
447 .remove = __devexit_p(tdo24m_remove),447 .remove = tdo24m_remove,
448 .shutdown = tdo24m_shutdown,448 .shutdown = tdo24m_shutdown,
449 .suspend = tdo24m_suspend,449 .suspend = tdo24m_suspend,
450 .resume = tdo24m_resume,450 .resume = tdo24m_resume,
drivers/video/backlight/tosa_bl.c+3−3
@@ -78,7 +78,7 @@ static const struct backlight_ops bl_ops = { · 77 unmodified lines
78 .update_status = tosa_bl_update_status,78 .update_status = tosa_bl_update_status,
79};79};
80 80
81static int __devinit tosa_bl_probe(struct i2c_client *client,81static int tosa_bl_probe(struct i2c_client *client,
82 const struct i2c_device_id *id)82 const struct i2c_device_id *id)
83{83{
84 struct backlight_properties props;84 struct backlight_properties props;
@@ -126,7 +126,7 @@ err_reg: · 41 unmodified lines
126 return ret;126 return ret;
127}127}
128 128
129static int __devexit tosa_bl_remove(struct i2c_client *client)129static int tosa_bl_remove(struct i2c_client *client)
130{130{
131 struct tosa_bl_data *data = i2c_get_clientdata(client);131 struct tosa_bl_data *data = i2c_get_clientdata(client);
132 132
@@ -170,7 +170,7 @@ static struct i2c_driver tosa_bl_driver = { · 37 unmodified lines
170 .owner = THIS_MODULE,170 .owner = THIS_MODULE,
171 },171 },
172 .probe = tosa_bl_probe,172 .probe = tosa_bl_probe,
173 .remove = __devexit_p(tosa_bl_remove),173 .remove = tosa_bl_remove,
174 .suspend = tosa_bl_suspend,174 .suspend = tosa_bl_suspend,
175 .resume = tosa_bl_resume,175 .resume = tosa_bl_resume,
176 .id_table = tosa_bl_id,176 .id_table = tosa_bl_id,
drivers/video/backlight/tosa_lcd.c+3−3
@@ -169,7 +169,7 @@ static struct lcd_ops tosa_lcd_ops = { · 168 unmodified lines
169 .set_mode = tosa_lcd_set_mode,169 .set_mode = tosa_lcd_set_mode,
170};170};
171 171
172static int __devinit tosa_lcd_probe(struct spi_device *spi)172static int tosa_lcd_probe(struct spi_device *spi)
173{173{
174 int ret;174 int ret;
175 struct tosa_lcd_data *data;175 struct tosa_lcd_data *data;
@@ -226,7 +226,7 @@ err_gpio_tg: · 50 unmodified lines
226 return ret;226 return ret;
227}227}
228 228
229static int __devexit tosa_lcd_remove(struct spi_device *spi)229static int tosa_lcd_remove(struct spi_device *spi)
230{230{
231 struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);231 struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
232 232
@@ -275,7 +275,7 @@ static struct spi_driver tosa_lcd_driver = { · 42 unmodified lines
275 .owner = THIS_MODULE,275 .owner = THIS_MODULE,
276 },276 },
277 .probe = tosa_lcd_probe,277 .probe = tosa_lcd_probe,
278 .remove = __devexit_p(tosa_lcd_remove),278 .remove = tosa_lcd_remove,
279 .suspend = tosa_lcd_suspend,279 .suspend = tosa_lcd_suspend,
280 .resume = tosa_lcd_resume,280 .resume = tosa_lcd_resume,
281};281};
drivers/video/backlight/vgg2432a4.c+3−3
@@ -227,7 +227,7 @@ static struct ili9320_client vgg2432a4_client = { · 226 unmodified lines
227 227
228/* Device probe */228/* Device probe */
229 229
230static int __devinit vgg2432a4_probe(struct spi_device *spi)230static int vgg2432a4_probe(struct spi_device *spi)
231{231{
232 int ret;232 int ret;
233 233
@@ -240,7 +240,7 @@ static int __devinit vgg2432a4_probe(struct spi_device *spi) · 6 unmodified lines
240 return 0;240 return 0;
241}241}
242 242
243static int __devexit vgg2432a4_remove(struct spi_device *spi)243static int vgg2432a4_remove(struct spi_device *spi)
244{244{
245 return ili9320_remove(dev_get_drvdata(&spi->dev));245 return ili9320_remove(dev_get_drvdata(&spi->dev));
246}246}
@@ -256,7 +256,7 @@ static struct spi_driver vgg2432a4_driver = { · 9 unmodified lines
256 .owner = THIS_MODULE,256 .owner = THIS_MODULE,
257 },257 },
258 .probe = vgg2432a4_probe,258 .probe = vgg2432a4_probe,
259 .remove = __devexit_p(vgg2432a4_remove),259 .remove = vgg2432a4_remove,
260 .shutdown = vgg2432a4_shutdown,260 .shutdown = vgg2432a4_shutdown,
261 .suspend = vgg2432a4_suspend,261 .suspend = vgg2432a4_suspend,
262 .resume = vgg2432a4_resume,262 .resume = vgg2432a4_resume,
drivers/watchdog/acquirewdt.c+3−3
@@ -240,7 +240,7 @@ static struct miscdevice acq_miscdev = { · 239 unmodified lines
240 * Init & exit routines240 * Init & exit routines
241 */241 */
242 242
243static int __devinit acq_probe(struct platform_device *dev)243static int acq_probe(struct platform_device *dev)
244{244{
245 int ret;245 int ret;
246 246
@@ -275,7 +275,7 @@ out: · 28 unmodified lines
275 return ret;275 return ret;
276}276}
277 277
278static int __devexit acq_remove(struct platform_device *dev)278static int acq_remove(struct platform_device *dev)
279{279{
280 misc_deregister(&acq_miscdev);280 misc_deregister(&acq_miscdev);
281 release_region(wdt_start, 1);281 release_region(wdt_start, 1);
@@ -293,7 +293,7 @@ static void acq_shutdown(struct platform_device *dev) · 11 unmodified lines
293 293
294static struct platform_driver acquirewdt_driver = {294static struct platform_driver acquirewdt_driver = {
295 .probe = acq_probe,295 .probe = acq_probe,
296 .remove = __devexit_p(acq_remove),296 .remove = acq_remove,
297 .shutdown = acq_shutdown,297 .shutdown = acq_shutdown,
298 .driver = {298 .driver = {
299 .owner = THIS_MODULE,299 .owner = THIS_MODULE,
drivers/watchdog/advantechwdt.c+3−3
@@ -238,7 +238,7 @@ static struct miscdevice advwdt_miscdev = { · 237 unmodified lines
238 * Init & exit routines238 * Init & exit routines
239 */239 */
240 240
241static int __devinit advwdt_probe(struct platform_device *dev)241static int advwdt_probe(struct platform_device *dev)
242{242{
243 int ret;243 int ret;
244 244
@@ -282,7 +282,7 @@ unreg_stop: · 37 unmodified lines
282 goto out;282 goto out;
283}283}
284 284
285static int __devexit advwdt_remove(struct platform_device *dev)285static int advwdt_remove(struct platform_device *dev)
286{286{
287 misc_deregister(&advwdt_miscdev);287 misc_deregister(&advwdt_miscdev);
288 release_region(wdt_start, 1);288 release_region(wdt_start, 1);
@@ -300,7 +300,7 @@ static void advwdt_shutdown(struct platform_device *dev) · 11 unmodified lines
300 300
301static struct platform_driver advwdt_driver = {301static struct platform_driver advwdt_driver = {
302 .probe = advwdt_probe,302 .probe = advwdt_probe,
303 .remove = __devexit_p(advwdt_remove),303 .remove = advwdt_remove,
304 .shutdown = advwdt_shutdown,304 .shutdown = advwdt_shutdown,
305 .driver = {305 .driver = {
306 .owner = THIS_MODULE,306 .owner = THIS_MODULE,
drivers/watchdog/ar7_wdt.c+3−3
@@ -274,7 +274,7 @@ static struct miscdevice ar7_wdt_miscdev = { · 273 unmodified lines
274 .fops = &ar7_wdt_fops,274 .fops = &ar7_wdt_fops,
275};275};
276 276
277static int __devinit ar7_wdt_probe(struct platform_device *pdev)277static int ar7_wdt_probe(struct platform_device *pdev)
278{278{
279 int rc;279 int rc;
280 280
@@ -314,7 +314,7 @@ out: · 33 unmodified lines
314 return rc;314 return rc;
315}315}
316 316
317static int __devexit ar7_wdt_remove(struct platform_device *pdev)317static int ar7_wdt_remove(struct platform_device *pdev)
318{318{
319 misc_deregister(&ar7_wdt_miscdev);319 misc_deregister(&ar7_wdt_miscdev);
320 clk_put(vbus_clk);320 clk_put(vbus_clk);
@@ -330,7 +330,7 @@ static void ar7_wdt_shutdown(struct platform_device *pdev) · 9 unmodified lines
330 330
331static struct platform_driver ar7_wdt_driver = {331static struct platform_driver ar7_wdt_driver = {
332 .probe = ar7_wdt_probe,332 .probe = ar7_wdt_probe,
333 .remove = __devexit_p(ar7_wdt_remove),333 .remove = ar7_wdt_remove,
334 .shutdown = ar7_wdt_shutdown,334 .shutdown = ar7_wdt_shutdown,
335 .driver = {335 .driver = {
336 .owner = THIS_MODULE,336 .owner = THIS_MODULE,
drivers/watchdog/at91rm9200_wdt.c+3−3
@@ -199,7 +199,7 @@ static struct miscdevice at91wdt_miscdev = { · 198 unmodified lines
199 .fops = &at91wdt_fops,199 .fops = &at91wdt_fops,
200};200};
201 201
202static int __devinit at91wdt_probe(struct platform_device *pdev)202static int at91wdt_probe(struct platform_device *pdev)
203{203{
204 int res;204 int res;
205 205
@@ -216,7 +216,7 @@ static int __devinit at91wdt_probe(struct platform_device *pdev) · 10 unmodified lines
216 return 0;216 return 0;
217}217}
218 218
219static int __devexit at91wdt_remove(struct platform_device *pdev)219static int at91wdt_remove(struct platform_device *pdev)
220{220{
221 int res;221 int res;
222 222
@@ -254,7 +254,7 @@ static int at91wdt_resume(struct platform_device *pdev) · 31 unmodified lines
254 254
255static struct platform_driver at91wdt_driver = {255static struct platform_driver at91wdt_driver = {
256 .probe = at91wdt_probe,256 .probe = at91wdt_probe,
257 .remove = __devexit_p(at91wdt_remove),257 .remove = at91wdt_remove,
258 .shutdown = at91wdt_shutdown,258 .shutdown = at91wdt_shutdown,
259 .suspend = at91wdt_suspend,259 .suspend = at91wdt_suspend,
260 .resume = at91wdt_resume,260 .resume = at91wdt_resume,
drivers/watchdog/ath79_wdt.c+3−3
@@ -224,7 +224,7 @@ static struct miscdevice ath79_wdt_miscdev = { · 223 unmodified lines
224 .fops = &ath79_wdt_fops,224 .fops = &ath79_wdt_fops,
225};225};
226 226
227static int __devinit ath79_wdt_probe(struct platform_device *pdev)227static int ath79_wdt_probe(struct platform_device *pdev)
228{228{
229 u32 ctrl;229 u32 ctrl;
230 int err;230 int err;
@@ -270,7 +270,7 @@ err_clk_put: · 39 unmodified lines
270 return err;270 return err;
271}271}
272 272
273static int __devexit ath79_wdt_remove(struct platform_device *pdev)273static int ath79_wdt_remove(struct platform_device *pdev)
274{274{
275 misc_deregister(&ath79_wdt_miscdev);275 misc_deregister(&ath79_wdt_miscdev);
276 clk_disable(wdt_clk);276 clk_disable(wdt_clk);
@@ -284,7 +284,7 @@ static void ath97_wdt_shutdown(struct platform_device *pdev) · 7 unmodified lines
284}284}
285 285
286static struct platform_driver ath79_wdt_driver = {286static struct platform_driver ath79_wdt_driver = {
287 .remove = __devexit_p(ath79_wdt_remove),287 .remove = ath79_wdt_remove,
288 .shutdown = ath97_wdt_shutdown,288 .shutdown = ath97_wdt_shutdown,
289 .driver = {289 .driver = {
290 .name = DRIVER_NAME,290 .name = DRIVER_NAME,
drivers/watchdog/bcm63xx_wdt.c+3−3
@@ -236,7 +236,7 @@ static struct miscdevice bcm63xx_wdt_miscdev = { · 235 unmodified lines
236};236};
237 237
238 238
239static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev)239static int bcm63xx_wdt_probe(struct platform_device *pdev)
240{240{
241 int ret;241 int ret;
242 struct resource *r;242 struct resource *r;
@@ -286,7 +286,7 @@ unmap: · 43 unmodified lines
286 return ret;286 return ret;
287}287}
288 288
289static int __devexit bcm63xx_wdt_remove(struct platform_device *pdev)289static int bcm63xx_wdt_remove(struct platform_device *pdev)
290{290{
291 if (!nowayout)291 if (!nowayout)
292 bcm63xx_wdt_pause();292 bcm63xx_wdt_pause();
@@ -304,7 +304,7 @@ static void bcm63xx_wdt_shutdown(struct platform_device *pdev) · 11 unmodified lines
304 304
305static struct platform_driver bcm63xx_wdt_driver = {305static struct platform_driver bcm63xx_wdt_driver = {
306 .probe = bcm63xx_wdt_probe,306 .probe = bcm63xx_wdt_probe,
307 .remove = __devexit_p(bcm63xx_wdt_remove),307 .remove = bcm63xx_wdt_remove,
308 .shutdown = bcm63xx_wdt_shutdown,308 .shutdown = bcm63xx_wdt_shutdown,
309 .driver = {309 .driver = {
310 .owner = THIS_MODULE,310 .owner = THIS_MODULE,
drivers/watchdog/bfin_wdt.c+3−3
@@ -356,7 +356,7 @@ static const struct watchdog_info bfin_wdt_info = { · 355 unmodified lines
356 * Registers the misc device. Actual device356 * Registers the misc device. Actual device
357 * initialization is handled by bfin_wdt_open().357 * initialization is handled by bfin_wdt_open().
358 */358 */
359static int __devinit bfin_wdt_probe(struct platform_device *pdev)359static int bfin_wdt_probe(struct platform_device *pdev)
360{360{
361 int ret;361 int ret;
362 362
@@ -379,7 +379,7 @@ static int __devinit bfin_wdt_probe(struct platform_device *pdev) · 16 unmodified lines
379 * Unregisters the misc device. Actual device379 * Unregisters the misc device. Actual device
380 * deinitialization is handled by bfin_wdt_close().380 * deinitialization is handled by bfin_wdt_close().
381 */381 */
382static int __devexit bfin_wdt_remove(struct platform_device *pdev)382static int bfin_wdt_remove(struct platform_device *pdev)
383{383{
384 misc_deregister(&bfin_wdt_miscdev);384 misc_deregister(&bfin_wdt_miscdev);
385 return 0;385 return 0;
@@ -401,7 +401,7 @@ static struct platform_device *bfin_wdt_device; · 15 unmodified lines
401 401
402static struct platform_driver bfin_wdt_driver = {402static struct platform_driver bfin_wdt_driver = {
403 .probe = bfin_wdt_probe,403 .probe = bfin_wdt_probe,
404 .remove = __devexit_p(bfin_wdt_remove),404 .remove = bfin_wdt_remove,
405 .shutdown = bfin_wdt_shutdown,405 .shutdown = bfin_wdt_shutdown,
406 .suspend = bfin_wdt_suspend,406 .suspend = bfin_wdt_suspend,
407 .resume = bfin_wdt_resume,407 .resume = bfin_wdt_resume,
drivers/watchdog/cpu5wdt.c+4−4
@@ -215,7 +215,7 @@ static struct miscdevice cpu5wdt_misc = { · 214 unmodified lines
215 215
216/* init/exit function */216/* init/exit function */
217 217
218static int __devinit cpu5wdt_init(void)218static int cpu5wdt_init(void)
219{219{
220 unsigned int val;220 unsigned int val;
221 int err;221 int err;
@@ -256,12 +256,12 @@ no_port: · 34 unmodified lines
256 return err;256 return err;
257}257}
258 258
259static int __devinit cpu5wdt_init_module(void)259static int cpu5wdt_init_module(void)
260{260{
261 return cpu5wdt_init();261 return cpu5wdt_init();
262}262}
263 263
264static void __devexit cpu5wdt_exit(void)264static void cpu5wdt_exit(void)
265{265{
266 if (cpu5wdt_device.queue) {266 if (cpu5wdt_device.queue) {
267 cpu5wdt_device.queue = 0;267 cpu5wdt_device.queue = 0;
@@ -274,7 +274,7 @@ static void __devexit cpu5wdt_exit(void) · 6 unmodified lines
274 274
275}275}
276 276
277static void __devexit cpu5wdt_exit_module(void)277static void cpu5wdt_exit_module(void)
278{278{
279 cpu5wdt_exit();279 cpu5wdt_exit();
280}280}
drivers/watchdog/cpwd.c+3−3
@@ -528,7 +528,7 @@ static const struct file_operations cpwd_fops = { · 527 unmodified lines
528 .llseek = no_llseek,528 .llseek = no_llseek,
529};529};
530 530
531static int __devinit cpwd_probe(struct platform_device *op)531static int cpwd_probe(struct platform_device *op)
532{532{
533 struct device_node *options;533 struct device_node *options;
534 const char *str_prop;534 const char *str_prop;
@@ -640,7 +640,7 @@ out_free: · 105 unmodified lines
640 goto out;640 goto out;
641}641}
642 642
643static int __devexit cpwd_remove(struct platform_device *op)643static int cpwd_remove(struct platform_device *op)
644{644{
645 struct cpwd *p = dev_get_drvdata(&op->dev);645 struct cpwd *p = dev_get_drvdata(&op->dev);
646 int i;646 int i;
@@ -684,7 +684,7 @@ static struct platform_driver cpwd_driver = { · 37 unmodified lines
684 .of_match_table = cpwd_match,684 .of_match_table = cpwd_match,
685 },685 },
686 .probe = cpwd_probe,686 .probe = cpwd_probe,
687 .remove = __devexit_p(cpwd_remove),687 .remove = cpwd_remove,
688};688};
689 689
690module_platform_driver(cpwd_driver);690module_platform_driver(cpwd_driver);
drivers/watchdog/da9052_wdt.c+3−3
@@ -179,7 +179,7 @@ static const struct watchdog_ops da9052_wdt_ops = { · 178 unmodified lines
179};179};
180 180
181 181
182static int __devinit da9052_wdt_probe(struct platform_device *pdev)182static int da9052_wdt_probe(struct platform_device *pdev)
183{183{
184 struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);184 struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);
185 struct da9052_wdt_data *driver_data;185 struct da9052_wdt_data *driver_data;
@@ -224,7 +224,7 @@ err: · 38 unmodified lines
224 return ret;224 return ret;
225}225}
226 226
227static int __devexit da9052_wdt_remove(struct platform_device *pdev)227static int da9052_wdt_remove(struct platform_device *pdev)
228{228{
229 struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);229 struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);
230 230
@@ -236,7 +236,7 @@ static int __devexit da9052_wdt_remove(struct platform_device *pdev) · 5 unmodified lines
236 236
237static struct platform_driver da9052_wdt_driver = {237static struct platform_driver da9052_wdt_driver = {
238 .probe = da9052_wdt_probe,238 .probe = da9052_wdt_probe,
239 .remove = __devexit_p(da9052_wdt_remove),239 .remove = da9052_wdt_remove,
240 .driver = {240 .driver = {
241 .name = "da9052-watchdog",241 .name = "da9052-watchdog",
242 },242 },
drivers/watchdog/davinci_wdt.c+3−3
@@ -199,7 +199,7 @@ static struct miscdevice davinci_wdt_miscdev = { · 198 unmodified lines
199 .fops = &davinci_wdt_fops,199 .fops = &davinci_wdt_fops,
200};200};
201 201
202static int __devinit davinci_wdt_probe(struct platform_device *pdev)202static int davinci_wdt_probe(struct platform_device *pdev)
203{203{
204 int ret = 0, size;204 int ret = 0, size;
205 struct device *dev = &pdev->dev;205 struct device *dev = &pdev->dev;
@@ -248,7 +248,7 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev) · 42 unmodified lines
248 return ret;248 return ret;
249}249}
250 250
251static int __devexit davinci_wdt_remove(struct platform_device *pdev)251static int davinci_wdt_remove(struct platform_device *pdev)
252{252{
253 misc_deregister(&davinci_wdt_miscdev);253 misc_deregister(&davinci_wdt_miscdev);
254 if (wdt_mem) {254 if (wdt_mem) {
@@ -268,7 +268,7 @@ static struct platform_driver platform_wdt_driver = { · 13 unmodified lines
268 .owner = THIS_MODULE,268 .owner = THIS_MODULE,
269 },269 },
270 .probe = davinci_wdt_probe,270 .probe = davinci_wdt_probe,
271 .remove = __devexit_p(davinci_wdt_remove),271 .remove = davinci_wdt_remove,
272};272};
273 273
274module_platform_driver(platform_wdt_driver);274module_platform_driver(platform_wdt_driver);
drivers/watchdog/dw_wdt.c+3−3
@@ -293,7 +293,7 @@ static struct miscdevice dw_wdt_miscdev = { · 292 unmodified lines
293 .minor = WATCHDOG_MINOR,293 .minor = WATCHDOG_MINOR,
294};294};
295 295
296static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)296static int dw_wdt_drv_probe(struct platform_device *pdev)
297{297{
298 int ret;298 int ret;
299 struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);299 struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -333,7 +333,7 @@ out_put_clk: · 33 unmodified lines
333 return ret;333 return ret;
334}334}
335 335
336static int __devexit dw_wdt_drv_remove(struct platform_device *pdev)336static int dw_wdt_drv_remove(struct platform_device *pdev)
337{337{
338 misc_deregister(&dw_wdt_miscdev);338 misc_deregister(&dw_wdt_miscdev);
339 339
@@ -345,7 +345,7 @@ static int __devexit dw_wdt_drv_remove(struct platform_device *pdev) · 5 unmodified lines
345 345
346static struct platform_driver dw_wdt_driver = {346static struct platform_driver dw_wdt_driver = {
347 .probe = dw_wdt_drv_probe,347 .probe = dw_wdt_drv_probe,
348 .remove = __devexit_p(dw_wdt_drv_remove),348 .remove = dw_wdt_drv_remove,
349 .driver = {349 .driver = {
350 .name = "dw_wdt",350 .name = "dw_wdt",
351 .owner = THIS_MODULE,351 .owner = THIS_MODULE,
drivers/watchdog/ep93xx_wdt.c+3−3
@@ -112,7 +112,7 @@ static struct watchdog_device ep93xx_wdt_wdd = { · 111 unmodified lines
112 .ops = &ep93xx_wdt_ops,112 .ops = &ep93xx_wdt_ops,
113};113};
114 114
115static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)115static int ep93xx_wdt_probe(struct platform_device *pdev)
116{116{
117 struct resource *res;117 struct resource *res;
118 unsigned long val;118 unsigned long val;
@@ -156,7 +156,7 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev) · 37 unmodified lines
156 return 0;156 return 0;
157}157}
158 158
159static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)159static int ep93xx_wdt_remove(struct platform_device *pdev)
160{160{
161 watchdog_unregister_device(&ep93xx_wdt_wdd);161 watchdog_unregister_device(&ep93xx_wdt_wdd);
162 return 0;162 return 0;
@@ -168,7 +168,7 @@ static struct platform_driver ep93xx_wdt_driver = { · 5 unmodified lines
168 .name = "ep93xx-wdt",168 .name = "ep93xx-wdt",
169 },169 },
170 .probe = ep93xx_wdt_probe,170 .probe = ep93xx_wdt_probe,
171 .remove = __devexit_p(ep93xx_wdt_remove),171 .remove = ep93xx_wdt_remove,
172};172};
173 173
174module_platform_driver(ep93xx_wdt_driver);174module_platform_driver(ep93xx_wdt_driver);
drivers/watchdog/gef_wdt.c+2−2
@@ -262,7 +262,7 @@ static struct miscdevice gef_wdt_miscdev = { · 261 unmodified lines
262};262};
263 263
264 264
265static int __devinit gef_wdt_probe(struct platform_device *dev)265static int gef_wdt_probe(struct platform_device *dev)
266{266{
267 int timeout = 10;267 int timeout = 10;
268 u32 freq;268 u32 freq;
@@ -285,7 +285,7 @@ static int __devinit gef_wdt_probe(struct platform_device *dev) · 16 unmodified lines
285 return misc_register(&gef_wdt_miscdev);285 return misc_register(&gef_wdt_miscdev);
286}286}
287 287
288static int __devexit gef_wdt_remove(struct platform_device *dev)288static int gef_wdt_remove(struct platform_device *dev)
289{289{
290 misc_deregister(&gef_wdt_miscdev);290 misc_deregister(&gef_wdt_miscdev);
291 291
drivers/watchdog/geodewdt.c+3−3
@@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscdev = { · 214 unmodified lines
215 .fops = &geodewdt_fops,215 .fops = &geodewdt_fops,
216};216};
217 217
218static int __devinit geodewdt_probe(struct platform_device *dev)218static int geodewdt_probe(struct platform_device *dev)
219{219{
220 int ret;220 int ret;
221 221
@@ -243,7 +243,7 @@ static int __devinit geodewdt_probe(struct platform_device *dev) · 21 unmodified lines
243 return ret;243 return ret;
244}244}
245 245
246static int __devexit geodewdt_remove(struct platform_device *dev)246static int geodewdt_remove(struct platform_device *dev)
247{247{
248 misc_deregister(&geodewdt_miscdev);248 misc_deregister(&geodewdt_miscdev);
249 return 0;249 return 0;
@@ -256,7 +256,7 @@ static void geodewdt_shutdown(struct platform_device *dev) · 6 unmodified lines
256 256
257static struct platform_driver geodewdt_driver = {257static struct platform_driver geodewdt_driver = {
258 .probe = geodewdt_probe,258 .probe = geodewdt_probe,
259 .remove = __devexit_p(geodewdt_remove),259 .remove = geodewdt_remove,
260 .shutdown = geodewdt_shutdown,260 .shutdown = geodewdt_shutdown,
261 .driver = {261 .driver = {
262 .owner = THIS_MODULE,262 .owner = THIS_MODULE,
drivers/watchdog/hpwdt.c+15−15
@@ -212,7 +212,7 @@ asm(".text \n\t" · 211 unmodified lines
212 * 0 : SUCCESS212 * 0 : SUCCESS
213 * <0 : FAILURE213 * <0 : FAILURE
214 */214 */
215static int __devinit cru_detect(unsigned long map_entry,215static int cru_detect(unsigned long map_entry,
216 unsigned long map_offset)216 unsigned long map_offset)
217{217{
218 void *bios32_map;218 void *bios32_map;
@@ -268,7 +268,7 @@ static int __devinit cru_detect(unsigned long map_entry, · 49 unmodified lines
268/*268/*
269 * bios_checksum269 * bios_checksum
270 */270 */
271static int __devinit bios_checksum(const char __iomem *ptr, int len)271static int bios_checksum(const char __iomem *ptr, int len)
272{272{
273 char sum = 0;273 char sum = 0;
274 int i;274 int i;
@@ -293,7 +293,7 @@ static int __devinit bios_checksum(const char __iomem *ptr, int len) · 18 unmodified lines
293 * 0 : SUCCESS293 * 0 : SUCCESS
294 * <0 : FAILURE294 * <0 : FAILURE
295 */295 */
296static int __devinit bios32_present(const char __iomem *p)296static int bios32_present(const char __iomem *p)
297{297{
298 struct bios32_service_dir *bios_32_ptr;298 struct bios32_service_dir *bios_32_ptr;
299 int length;299 int length;
@@ -323,7 +323,7 @@ static int __devinit bios32_present(const char __iomem *p) · 23 unmodified lines
323 return -ENODEV;323 return -ENODEV;
324}324}
325 325
326static int __devinit detect_cru_service(void)326static int detect_cru_service(void)
327{327{
328 char __iomem *p, *q;328 char __iomem *p, *q;
329 int rc = -1;329 int rc = -1;
@@ -395,7 +395,7 @@ asm(".text \n\t" · 65 unmodified lines
395 * This function checks whether or not a SMBIOS/DMI record is395 * This function checks whether or not a SMBIOS/DMI record is
396 * the 64bit CRU info or not396 * the 64bit CRU info or not
397 */397 */
398static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy)398static void dmi_find_cru(const struct dmi_header *dm, void *dummy)
399{399{
400 struct smbios_cru64_info *smbios_cru64_ptr;400 struct smbios_cru64_info *smbios_cru64_ptr;
401 unsigned long cru_physical_address;401 unsigned long cru_physical_address;
@@ -414,7 +414,7 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy) · 12 unmodified lines
414 }414 }
415}415}
416 416
417static int __devinit detect_cru_service(void)417static int detect_cru_service(void)
418{418{
419 cru_rom_addr = NULL;419 cru_rom_addr = NULL;
420 420
@@ -647,7 +647,7 @@ static struct miscdevice hpwdt_miscdev = { · 226 unmodified lines
647 647
648#ifdef CONFIG_HPWDT_NMI_DECODING648#ifdef CONFIG_HPWDT_NMI_DECODING
649#ifdef CONFIG_X86_LOCAL_APIC649#ifdef CONFIG_X86_LOCAL_APIC
650static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)650static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
651{651{
652 /*652 /*
653 * If nmi_watchdog is turned off then we can turn on653 * 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) · 2 unmodified lines
656 hpwdt_nmi_decoding = 1;656 hpwdt_nmi_decoding = 1;
657}657}
658#else658#else
659static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)659static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
660{660{
661 dev_warn(&dev->dev, "NMI decoding is disabled. "661 dev_warn(&dev->dev, "NMI decoding is disabled. "
662 "Your kernel does not support a NMI Watchdog.\n");662 "Your kernel does not support a NMI Watchdog.\n");
@@ -671,7 +671,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) · 8 unmodified lines
671 * This check is independent of architecture and needs to be made for671 * This check is independent of architecture and needs to be made for
672 * any ProLiant system.672 * any ProLiant system.
673 */673 */
674static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy)674static void dmi_find_icru(const struct dmi_header *dm, void *dummy)
675{675{
676 struct smbios_proliant_info *smbios_proliant_ptr;676 struct smbios_proliant_info *smbios_proliant_ptr;
677 677
@@ -682,7 +682,7 @@ static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy) · 4 unmodified lines
682 }682 }
683}683}
684 684
685static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)685static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
686{686{
687 int retval;687 int retval;
688 688
@@ -762,11 +762,11 @@ static void hpwdt_exit_nmi_decoding(void) · 73 unmodified lines
762 iounmap(cru_rom_addr);762 iounmap(cru_rom_addr);
763}763}
764#else /* !CONFIG_HPWDT_NMI_DECODING */764#else /* !CONFIG_HPWDT_NMI_DECODING */
765static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)765static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
766{766{
767}767}
768 768
769static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)769static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
770{770{
771 return 0;771 return 0;
772}772}
@@ -776,7 +776,7 @@ static void hpwdt_exit_nmi_decoding(void) · 3 unmodified lines
776}776}
777#endif /* CONFIG_HPWDT_NMI_DECODING */777#endif /* CONFIG_HPWDT_NMI_DECODING */
778 778
779static int __devinit hpwdt_init_one(struct pci_dev *dev,779static int hpwdt_init_one(struct pci_dev *dev,
780 const struct pci_device_id *ent)780 const struct pci_device_id *ent)
781{781{
782 int retval;782 int retval;
@@ -848,7 +848,7 @@ error_pci_iomap: · 65 unmodified lines
848 return retval;848 return retval;
849}849}
850 850
851static void __devexit hpwdt_exit(struct pci_dev *dev)851static void hpwdt_exit(struct pci_dev *dev)
852{852{
853 if (!nowayout)853 if (!nowayout)
854 hpwdt_stop();854 hpwdt_stop();
@@ -863,7 +863,7 @@ static struct pci_driver hpwdt_driver = { · 8 unmodified lines
863 .name = "hpwdt",863 .name = "hpwdt",
864 .id_table = hpwdt_devices,864 .id_table = hpwdt_devices,
865 .probe = hpwdt_init_one,865 .probe = hpwdt_init_one,
866 .remove = __devexit_p(hpwdt_exit),866 .remove = hpwdt_exit,
867};867};
868 868
869MODULE_AUTHOR("Tom Mingarelli");869MODULE_AUTHOR("Tom Mingarelli");
drivers/watchdog/i6300esb.c+5−5
@@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(pci, esb_pci_tbl); · 343 unmodified lines
344 * Init & exit routines344 * Init & exit routines
345 */345 */
346 346
347static unsigned char __devinit esb_getdevice(struct pci_dev *pdev)347static unsigned char esb_getdevice(struct pci_dev *pdev)
348{348{
349 if (pci_enable_device(pdev)) {349 if (pci_enable_device(pdev)) {
350 pr_err("failed to enable device\n");350 pr_err("failed to enable device\n");
@@ -375,7 +375,7 @@ err_devput: · 24 unmodified lines
375 return 0;375 return 0;
376}376}
377 377
378static void __devinit esb_initdevice(void)378static void esb_initdevice(void)
379{379{
380 u8 val1;380 u8 val1;
381 u16 val2;381 u16 val2;
@@ -416,7 +416,7 @@ static void __devinit esb_initdevice(void) · 34 unmodified lines
416 esb_timer_set_heartbeat(heartbeat);416 esb_timer_set_heartbeat(heartbeat);
417}417}
418 418
419static int __devinit esb_probe(struct pci_dev *pdev,419static int esb_probe(struct pci_dev *pdev,
420 const struct pci_device_id *ent)420 const struct pci_device_id *ent)
421{421{
422 int ret;422 int ret;
@@ -465,7 +465,7 @@ err_unmap: · 42 unmodified lines
465 return ret;465 return ret;
466}466}
467 467
468static void __devexit esb_remove(struct pci_dev *pdev)468static void esb_remove(struct pci_dev *pdev)
469{469{
470 /* Stop the timer before we leave */470 /* Stop the timer before we leave */
471 if (!nowayout)471 if (!nowayout)
@@ -488,7 +488,7 @@ static struct pci_driver esb_driver = { · 16 unmodified lines
488 .name = ESB_MODULE_NAME,488 .name = ESB_MODULE_NAME,
489 .id_table = esb_pci_tbl,489 .id_table = esb_pci_tbl,
490 .probe = esb_probe,490 .probe = esb_probe,
491 .remove = __devexit_p(esb_remove),491 .remove = esb_remove,
492 .shutdown = esb_shutdown,492 .shutdown = esb_shutdown,
493};493};
494 494
drivers/watchdog/iTCO_wdt.c+4−4
@@ -364,7 +364,7 @@ static struct watchdog_device iTCO_wdt_watchdog_dev = { · 363 unmodified lines
364 * Init & exit routines364 * Init & exit routines
365 */365 */
366 366
367static void __devexit iTCO_wdt_cleanup(void)367static void iTCO_wdt_cleanup(void)
368{368{
369 /* Stop the timer before we leave */369 /* Stop the timer before we leave */
370 if (!nowayout)370 if (!nowayout)
@@ -390,7 +390,7 @@ static void __devexit iTCO_wdt_cleanup(void) · 19 unmodified lines
390 iTCO_wdt_private.gcs = NULL;390 iTCO_wdt_private.gcs = NULL;
391}391}
392 392
393static int __devinit iTCO_wdt_probe(struct platform_device *dev)393static int iTCO_wdt_probe(struct platform_device *dev)
394{394{
395 int ret = -ENODEV;395 int ret = -ENODEV;
396 unsigned long val32;396 unsigned long val32;
@@ -533,7 +533,7 @@ out: · 136 unmodified lines
533 return ret;533 return ret;
534}534}
535 535
536static int __devexit iTCO_wdt_remove(struct platform_device *dev)536static int iTCO_wdt_remove(struct platform_device *dev)
537{537{
538 if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res)538 if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res)
539 iTCO_wdt_cleanup();539 iTCO_wdt_cleanup();
@@ -548,7 +548,7 @@ static void iTCO_wdt_shutdown(struct platform_device *dev) · 8 unmodified lines
548 548
549static struct platform_driver iTCO_wdt_driver = {549static struct platform_driver iTCO_wdt_driver = {
550 .probe = iTCO_wdt_probe,550 .probe = iTCO_wdt_probe,
551 .remove = __devexit_p(iTCO_wdt_remove),551 .remove = iTCO_wdt_remove,
552 .shutdown = iTCO_wdt_shutdown,552 .shutdown = iTCO_wdt_shutdown,
553 .driver = {553 .driver = {
554 .owner = THIS_MODULE,554 .owner = THIS_MODULE,
drivers/watchdog/ib700wdt.c+3−3
@@ -277,7 +277,7 @@ static struct miscdevice ibwdt_miscdev = { · 276 unmodified lines
277 * Init & exit routines277 * Init & exit routines
278 */278 */
279 279
280static int __devinit ibwdt_probe(struct platform_device *dev)280static int ibwdt_probe(struct platform_device *dev)
281{281{
282 int res;282 int res;
283 283
@@ -319,7 +319,7 @@ out_nostopreg: · 35 unmodified lines
319 return res;319 return res;
320}320}
321 321
322static int __devexit ibwdt_remove(struct platform_device *dev)322static int ibwdt_remove(struct platform_device *dev)
323{323{
324 misc_deregister(&ibwdt_miscdev);324 misc_deregister(&ibwdt_miscdev);
325 release_region(WDT_START, 1);325 release_region(WDT_START, 1);
@@ -337,7 +337,7 @@ static void ibwdt_shutdown(struct platform_device *dev) · 11 unmodified lines
337 337
338static struct platform_driver ibwdt_driver = {338static struct platform_driver ibwdt_driver = {
339 .probe = ibwdt_probe,339 .probe = ibwdt_probe,
340 .remove = __devexit_p(ibwdt_remove),340 .remove = ibwdt_remove,
341 .shutdown = ibwdt_shutdown,341 .shutdown = ibwdt_shutdown,
342 .driver = {342 .driver = {
343 .owner = THIS_MODULE,343 .owner = THIS_MODULE,
drivers/watchdog/ie6xx_wdt.c+5−5
@@ -225,7 +225,7 @@ static const struct file_operations ie6xx_wdt_dbg_operations = { · 224 unmodified lines
225 .release = single_release,225 .release = single_release,
226};226};
227 227
228static void __devinit ie6xx_wdt_debugfs_init(void)228static void ie6xx_wdt_debugfs_init(void)
229{229{
230 /* /sys/kernel/debug/ie6xx_wdt */230 /* /sys/kernel/debug/ie6xx_wdt */
231 ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt",231 ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt",
@@ -238,7 +238,7 @@ static void ie6xx_wdt_debugfs_exit(void) · 6 unmodified lines
238}238}
239 239
240#else240#else
241static void __devinit ie6xx_wdt_debugfs_init(void)241static void ie6xx_wdt_debugfs_init(void)
242{242{
243}243}
244 244
@@ -247,7 +247,7 @@ static void ie6xx_wdt_debugfs_exit(void) · 2 unmodified lines
247}247}
248#endif248#endif
249 249
250static int __devinit ie6xx_wdt_probe(struct platform_device *pdev)250static int ie6xx_wdt_probe(struct platform_device *pdev)
251{251{
252 struct resource *res;252 struct resource *res;
253 u8 wdtlr;253 u8 wdtlr;
@@ -295,7 +295,7 @@ misc_register_error: · 41 unmodified lines
295 return ret;295 return ret;
296}296}
297 297
298static int __devexit ie6xx_wdt_remove(struct platform_device *pdev)298static int ie6xx_wdt_remove(struct platform_device *pdev)
299{299{
300 struct resource *res;300 struct resource *res;
301 301
@@ -311,7 +311,7 @@ static int __devexit ie6xx_wdt_remove(struct platform_device *pdev) · 9 unmodified lines
311 311
312static struct platform_driver ie6xx_wdt_driver = {312static struct platform_driver ie6xx_wdt_driver = {
313 .probe = ie6xx_wdt_probe,313 .probe = ie6xx_wdt_probe,
314 .remove = __devexit_p(ie6xx_wdt_remove),314 .remove = ie6xx_wdt_remove,
315 .driver = {315 .driver = {
316 .name = DRIVER_NAME,316 .name = DRIVER_NAME,
317 .owner = THIS_MODULE,317 .owner = THIS_MODULE,
drivers/watchdog/jz4740_wdt.c+3−3
@@ -144,7 +144,7 @@ static const struct watchdog_ops jz4740_wdt_ops = { · 143 unmodified lines
144 .set_timeout = jz4740_wdt_set_timeout,144 .set_timeout = jz4740_wdt_set_timeout,
145};145};
146 146
147static int __devinit jz4740_wdt_probe(struct platform_device *pdev)147static int jz4740_wdt_probe(struct platform_device *pdev)
148{148{
149 struct jz4740_wdt_drvdata *drvdata;149 struct jz4740_wdt_drvdata *drvdata;
150 struct watchdog_device *jz4740_wdt;150 struct watchdog_device *jz4740_wdt;
@@ -197,7 +197,7 @@ err_out: · 46 unmodified lines
197 return ret;197 return ret;
198}198}
199 199
200static int __devexit jz4740_wdt_remove(struct platform_device *pdev)200static int jz4740_wdt_remove(struct platform_device *pdev)
201{201{
202 struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);202 struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);
203 203
@@ -210,7 +210,7 @@ static int __devexit jz4740_wdt_remove(struct platform_device *pdev) · 6 unmodified lines
210 210
211static struct platform_driver jz4740_wdt_driver = {211static struct platform_driver jz4740_wdt_driver = {
212 .probe = jz4740_wdt_probe,212 .probe = jz4740_wdt_probe,
213 .remove = __devexit_p(jz4740_wdt_remove),213 .remove = jz4740_wdt_remove,
214 .driver = {214 .driver = {
215 .name = "jz4740-wdt",215 .name = "jz4740-wdt",
216 .owner = THIS_MODULE,216 .owner = THIS_MODULE,
drivers/watchdog/ks8695_wdt.c+3−3
@@ -235,7 +235,7 @@ static struct miscdevice ks8695wdt_miscdev = { · 234 unmodified lines
235 .fops = &ks8695wdt_fops,235 .fops = &ks8695wdt_fops,
236};236};
237 237
238static int __devinit ks8695wdt_probe(struct platform_device *pdev)238static int ks8695wdt_probe(struct platform_device *pdev)
239{239{
240 int res;240 int res;
241 241
@@ -252,7 +252,7 @@ static int __devinit ks8695wdt_probe(struct platform_device *pdev) · 10 unmodified lines
252 return 0;252 return 0;
253}253}
254 254
255static int __devexit ks8695wdt_remove(struct platform_device *pdev)255static int ks8695wdt_remove(struct platform_device *pdev)
256{256{
257 int res;257 int res;
258 258
@@ -290,7 +290,7 @@ static int ks8695wdt_resume(struct platform_device *pdev) · 31 unmodified lines
290 290
291static struct platform_driver ks8695wdt_driver = {291static struct platform_driver ks8695wdt_driver = {
292 .probe = ks8695wdt_probe,292 .probe = ks8695wdt_probe,
293 .remove = __devexit_p(ks8695wdt_remove),293 .remove = ks8695wdt_remove,
294 .shutdown = ks8695wdt_shutdown,294 .shutdown = ks8695wdt_shutdown,
295 .suspend = ks8695wdt_suspend,295 .suspend = ks8695wdt_suspend,
296 .resume = ks8695wdt_resume,296 .resume = ks8695wdt_resume,
drivers/watchdog/lantiq_wdt.c+3−3
@@ -186,7 +186,7 @@ static struct miscdevice ltq_wdt_miscdev = { · 185 unmodified lines
186 .fops = &ltq_wdt_fops,186 .fops = &ltq_wdt_fops,
187};187};
188 188
189static int __devinit189static int
190ltq_wdt_probe(struct platform_device *pdev)190ltq_wdt_probe(struct platform_device *pdev)
191{191{
192 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);192 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -220,7 +220,7 @@ ltq_wdt_probe(struct platform_device *pdev) · 27 unmodified lines
220 return misc_register(&ltq_wdt_miscdev);220 return misc_register(&ltq_wdt_miscdev);
221}221}
222 222
223static int __devexit223static int
224ltq_wdt_remove(struct platform_device *pdev)224ltq_wdt_remove(struct platform_device *pdev)
225{225{
226 misc_deregister(&ltq_wdt_miscdev);226 misc_deregister(&ltq_wdt_miscdev);
@@ -236,7 +236,7 @@ MODULE_DEVICE_TABLE(of, ltq_wdt_match); · 9 unmodified lines
236 236
237static struct platform_driver ltq_wdt_driver = {237static struct platform_driver ltq_wdt_driver = {
238 .probe = ltq_wdt_probe,238 .probe = ltq_wdt_probe,
239 .remove = __devexit_p(ltq_wdt_remove),239 .remove = ltq_wdt_remove,
240 .driver = {240 .driver = {
241 .name = "wdt",241 .name = "wdt",
242 .owner = THIS_MODULE,242 .owner = THIS_MODULE,
drivers/watchdog/max63xx_wdt.c+3−3
@@ -174,7 +174,7 @@ static struct watchdog_device max63xx_wdt_dev = { · 173 unmodified lines
174 .ops = &max63xx_wdt_ops,174 .ops = &max63xx_wdt_ops,
175};175};
176 176
177static int __devinit max63xx_wdt_probe(struct platform_device *pdev)177static int max63xx_wdt_probe(struct platform_device *pdev)
178{178{
179 struct resource *wdt_mem;179 struct resource *wdt_mem;
180 struct max63xx_timeout *table;180 struct max63xx_timeout *table;
@@ -209,7 +209,7 @@ static int __devinit max63xx_wdt_probe(struct platform_device *pdev) · 28 unmodified lines
209 return watchdog_register_device(&max63xx_wdt_dev);209 return watchdog_register_device(&max63xx_wdt_dev);
210}210}
211 211
212static int __devexit max63xx_wdt_remove(struct platform_device *pdev)212static int max63xx_wdt_remove(struct platform_device *pdev)
213{213{
214 watchdog_unregister_device(&max63xx_wdt_dev);214 watchdog_unregister_device(&max63xx_wdt_dev);
215 return 0;215 return 0;
@@ -228,7 +228,7 @@ MODULE_DEVICE_TABLE(platform, max63xx_id_table); · 12 unmodified lines
228 228
229static struct platform_driver max63xx_wdt_driver = {229static struct platform_driver max63xx_wdt_driver = {
230 .probe = max63xx_wdt_probe,230 .probe = max63xx_wdt_probe,
231 .remove = __devexit_p(max63xx_wdt_remove),231 .remove = max63xx_wdt_remove,
232 .id_table = max63xx_id_table,232 .id_table = max63xx_id_table,
233 .driver = {233 .driver = {
234 .name = "max63xx_wdt",234 .name = "max63xx_wdt",
drivers/watchdog/mixcomwd.c+1−1
@@ -73,7 +73,7 @@ · 72 unmodified lines
73static struct {73static struct {
74 int ioport;74 int ioport;
75 int id;75 int id;
76} mixcomwd_io_info[] __devinitdata = {76} mixcomwd_io_info[] = {
77 /* The Mixcom cards */77 /* The Mixcom cards */
78 {0x0d90, MIXCOM_ID},78 {0x0d90, MIXCOM_ID},
79 {0x0e90, MIXCOM_ID},79 {0x0e90, MIXCOM_ID},
drivers/watchdog/mpc8xxx_wdt.c+3−3
@@ -188,7 +188,7 @@ static struct miscdevice mpc8xxx_wdt_miscdev = { · 187 unmodified lines
188};188};
189 189
190static const struct of_device_id mpc8xxx_wdt_match[];190static const struct of_device_id mpc8xxx_wdt_match[];
191static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)191static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
192{192{
193 int ret;193 int ret;
194 const struct of_device_id *match;194 const struct of_device_id *match;
@@ -245,7 +245,7 @@ err_unmap: · 50 unmodified lines
245 return ret;245 return ret;
246}246}
247 247
248static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev)248static int mpc8xxx_wdt_remove(struct platform_device *ofdev)
249{249{
250 mpc8xxx_wdt_pr_warn("watchdog removed");250 mpc8xxx_wdt_pr_warn("watchdog removed");
251 del_timer_sync(&wdt_timer);251 del_timer_sync(&wdt_timer);
@@ -281,7 +281,7 @@ MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match); · 29 unmodified lines
281 281
282static struct platform_driver mpc8xxx_wdt_driver = {282static struct platform_driver mpc8xxx_wdt_driver = {
283 .probe = mpc8xxx_wdt_probe,283 .probe = mpc8xxx_wdt_probe,
284 .remove = __devexit_p(mpc8xxx_wdt_remove),284 .remove = mpc8xxx_wdt_remove,
285 .driver = {285 .driver = {
286 .name = "mpc8xxx_wdt",286 .name = "mpc8xxx_wdt",
287 .owner = THIS_MODULE,287 .owner = THIS_MODULE,
drivers/watchdog/mpcore_wdt.c+3−3
@@ -327,7 +327,7 @@ static struct miscdevice mpcore_wdt_miscdev = { · 326 unmodified lines
327 .fops = &mpcore_wdt_fops,327 .fops = &mpcore_wdt_fops,
328};328};
329 329
330static int __devinit mpcore_wdt_probe(struct platform_device *pdev)330static int mpcore_wdt_probe(struct platform_device *pdev)
331{331{
332 struct mpcore_wdt *wdt;332 struct mpcore_wdt *wdt;
333 struct resource *res;333 struct resource *res;
@@ -378,7 +378,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev) · 44 unmodified lines
378 return 0;378 return 0;
379}379}
380 380
381static int __devexit mpcore_wdt_remove(struct platform_device *pdev)381static int mpcore_wdt_remove(struct platform_device *pdev)
382{382{
383 platform_set_drvdata(pdev, NULL);383 platform_set_drvdata(pdev, NULL);
384 384
@@ -415,7 +415,7 @@ MODULE_ALIAS("platform:mpcore_wdt"); · 30 unmodified lines
415 415
416static struct platform_driver mpcore_wdt_driver = {416static struct platform_driver mpcore_wdt_driver = {
417 .probe = mpcore_wdt_probe,417 .probe = mpcore_wdt_probe,
418 .remove = __devexit_p(mpcore_wdt_remove),418 .remove = mpcore_wdt_remove,
419 .suspend = mpcore_wdt_suspend,419 .suspend = mpcore_wdt_suspend,
420 .resume = mpcore_wdt_resume,420 .resume = mpcore_wdt_resume,
421 .shutdown = mpcore_wdt_shutdown,421 .shutdown = mpcore_wdt_shutdown,
drivers/watchdog/mtx-1_wdt.c+3−3
@@ -204,7 +204,7 @@ static struct miscdevice mtx1_wdt_misc = { · 203 unmodified lines
204};204};
205 205
206 206
207static int __devinit mtx1_wdt_probe(struct platform_device *pdev)207static int mtx1_wdt_probe(struct platform_device *pdev)
208{208{
209 int ret;209 int ret;
210 210
@@ -233,7 +233,7 @@ static int __devinit mtx1_wdt_probe(struct platform_device *pdev) · 22 unmodified lines
233 return 0;233 return 0;
234}234}
235 235
236static int __devexit mtx1_wdt_remove(struct platform_device *pdev)236static int mtx1_wdt_remove(struct platform_device *pdev)
237{237{
238 /* FIXME: do we need to lock this test ? */238 /* FIXME: do we need to lock this test ? */
239 if (mtx1_wdt_device.queue) {239 if (mtx1_wdt_device.queue) {
@@ -248,7 +248,7 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev) · 8 unmodified lines
248 248
249static struct platform_driver mtx1_wdt_driver = {249static struct platform_driver mtx1_wdt_driver = {
250 .probe = mtx1_wdt_probe,250 .probe = mtx1_wdt_probe,
251 .remove = __devexit_p(mtx1_wdt_remove),251 .remove = mtx1_wdt_remove,
252 .driver.name = "mtx1-wdt",252 .driver.name = "mtx1-wdt",
253 .driver.owner = THIS_MODULE,253 .driver.owner = THIS_MODULE,
254};254};
drivers/watchdog/mv64x60_wdt.c+3−3
@@ -253,7 +253,7 @@ static struct miscdevice mv64x60_wdt_miscdev = { · 252 unmodified lines
253 .fops = &mv64x60_wdt_fops,253 .fops = &mv64x60_wdt_fops,
254};254};
255 255
256static int __devinit mv64x60_wdt_probe(struct platform_device *dev)256static int mv64x60_wdt_probe(struct platform_device *dev)
257{257{
258 struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;258 struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
259 struct resource *r;259 struct resource *r;
@@ -287,7 +287,7 @@ static int __devinit mv64x60_wdt_probe(struct platform_device *dev) · 27 unmodified lines
287 return misc_register(&mv64x60_wdt_miscdev);287 return misc_register(&mv64x60_wdt_miscdev);
288}288}
289 289
290static int __devexit mv64x60_wdt_remove(struct platform_device *dev)290static int mv64x60_wdt_remove(struct platform_device *dev)
291{291{
292 misc_deregister(&mv64x60_wdt_miscdev);292 misc_deregister(&mv64x60_wdt_miscdev);
293 293
@@ -300,7 +300,7 @@ static int __devexit mv64x60_wdt_remove(struct platform_device *dev) · 6 unmodified lines
300 300
301static struct platform_driver mv64x60_wdt_driver = {301static struct platform_driver mv64x60_wdt_driver = {
302 .probe = mv64x60_wdt_probe,302 .probe = mv64x60_wdt_probe,
303 .remove = __devexit_p(mv64x60_wdt_remove),303 .remove = mv64x60_wdt_remove,
304 .driver = {304 .driver = {
305 .owner = THIS_MODULE,305 .owner = THIS_MODULE,
306 .name = MV64x60_WDT_NAME,306 .name = MV64x60_WDT_NAME,
drivers/watchdog/nuc900_wdt.c+3−3
@@ -242,7 +242,7 @@ static struct miscdevice nuc900wdt_miscdev = { · 241 unmodified lines
242 .fops = &nuc900wdt_fops,242 .fops = &nuc900wdt_fops,
243};243};
244 244
245static int __devinit nuc900wdt_probe(struct platform_device *pdev)245static int nuc900wdt_probe(struct platform_device *pdev)
246{246{
247 int ret = 0;247 int ret = 0;
248 248
@@ -309,7 +309,7 @@ err_get: · 60 unmodified lines
309 return ret;309 return ret;
310}310}
311 311
312static int __devexit nuc900wdt_remove(struct platform_device *pdev)312static int nuc900wdt_remove(struct platform_device *pdev)
313{313{
314 misc_deregister(&nuc900wdt_miscdev);314 misc_deregister(&nuc900wdt_miscdev);
315 315
@@ -328,7 +328,7 @@ static int __devexit nuc900wdt_remove(struct platform_device *pdev) · 12 unmodified lines
328 328
329static struct platform_driver nuc900wdt_driver = {329static struct platform_driver nuc900wdt_driver = {
330 .probe = nuc900wdt_probe,330 .probe = nuc900wdt_probe,
331 .remove = __devexit_p(nuc900wdt_remove),331 .remove = nuc900wdt_remove,
332 .driver = {332 .driver = {
333 .name = "nuc900-wdt",333 .name = "nuc900-wdt",
334 .owner = THIS_MODULE,334 .owner = THIS_MODULE,
drivers/watchdog/nv_tco.c+5−5
@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, tco_pci_tbl); · 301 unmodified lines
302 * Init & exit routines302 * Init & exit routines
303 */303 */
304 304
305static unsigned char __devinit nv_tco_getdevice(void)305static unsigned char nv_tco_getdevice(void)
306{306{
307 struct pci_dev *dev = NULL;307 struct pci_dev *dev = NULL;
308 u32 val;308 u32 val;
@@ -376,7 +376,7 @@ out: · 67 unmodified lines
376 return 0;376 return 0;
377}377}
378 378
379static int __devinit nv_tco_init(struct platform_device *dev)379static int nv_tco_init(struct platform_device *dev)
380{380{
381 int ret;381 int ret;
382 382
@@ -423,7 +423,7 @@ unreg_region: · 40 unmodified lines
423 return ret;423 return ret;
424}424}
425 425
426static void __devexit nv_tco_cleanup(void)426static void nv_tco_cleanup(void)
427{427{
428 u32 val;428 u32 val;
429 429
@@ -445,7 +445,7 @@ static void __devexit nv_tco_cleanup(void) · 15 unmodified lines
445 release_region(tcobase, 0x10);445 release_region(tcobase, 0x10);
446}446}
447 447
448static int __devexit nv_tco_remove(struct platform_device *dev)448static int nv_tco_remove(struct platform_device *dev)
449{449{
450 if (tcobase)450 if (tcobase)
451 nv_tco_cleanup();451 nv_tco_cleanup();
@@ -468,7 +468,7 @@ static void nv_tco_shutdown(struct platform_device *dev) · 16 unmodified lines
468 468
469static struct platform_driver nv_tco_driver = {469static struct platform_driver nv_tco_driver = {
470 .probe = nv_tco_init,470 .probe = nv_tco_init,
471 .remove = __devexit_p(nv_tco_remove),471 .remove = nv_tco_remove,
472 .shutdown = nv_tco_shutdown,472 .shutdown = nv_tco_shutdown,
473 .driver = {473 .driver = {
474 .owner = THIS_MODULE,474 .owner = THIS_MODULE,
drivers/watchdog/of_xilinx_wdt.c+4−4
@@ -289,7 +289,7 @@ static struct miscdevice xwdt_miscdev = { · 288 unmodified lines
289 .fops = &xwdt_fops,289 .fops = &xwdt_fops,
290};290};
291 291
292static int __devinit xwdt_probe(struct platform_device *pdev)292static int xwdt_probe(struct platform_device *pdev)
293{293{
294 int rc;294 int rc;
295 u32 *tmptr;295 u32 *tmptr;
@@ -383,7 +383,7 @@ err_out: · 87 unmodified lines
383 return rc;383 return rc;
384}384}
385 385
386static int __devexit xwdt_remove(struct platform_device *dev)386static int xwdt_remove(struct platform_device *dev)
387{387{
388 misc_deregister(&xwdt_miscdev);388 misc_deregister(&xwdt_miscdev);
389 iounmap(xdev.base);389 iounmap(xdev.base);
@@ -393,7 +393,7 @@ static int __devexit xwdt_remove(struct platform_device *dev) · 3 unmodified lines
393}393}
394 394
395/* Match table for of_platform binding */395/* Match table for of_platform binding */
396static struct of_device_id __devinitdata xwdt_of_match[] = {396static struct of_device_id xwdt_of_match[] = {
397 { .compatible = "xlnx,xps-timebase-wdt-1.01.a", },397 { .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
398 {},398 {},
399};399};
@@ -401,7 +401,7 @@ MODULE_DEVICE_TABLE(of, xwdt_of_match); · 1 unmodified line
401 401
402static struct platform_driver xwdt_driver = {402static struct platform_driver xwdt_driver = {
403 .probe = xwdt_probe,403 .probe = xwdt_probe,
404 .remove = __devexit_p(xwdt_remove),404 .remove = xwdt_remove,
405 .driver = {405 .driver = {
406 .owner = THIS_MODULE,406 .owner = THIS_MODULE,
407 .name = WATCHDOG_NAME,407 .name = WATCHDOG_NAME,
drivers/watchdog/omap_wdt.c+3−3
@@ -264,7 +264,7 @@ static const struct file_operations omap_wdt_fops = { · 263 unmodified lines
264 .llseek = no_llseek,264 .llseek = no_llseek,
265};265};
266 266
267static int __devinit omap_wdt_probe(struct platform_device *pdev)267static int omap_wdt_probe(struct platform_device *pdev)
268{268{
269 struct resource *res, *mem;269 struct resource *res, *mem;
270 struct omap_wdt_dev *wdev;270 struct omap_wdt_dev *wdev;
@@ -359,7 +359,7 @@ static void omap_wdt_shutdown(struct platform_device *pdev) · 88 unmodified lines
359 }359 }
360}360}
361 361
362static int __devexit omap_wdt_remove(struct platform_device *pdev)362static int omap_wdt_remove(struct platform_device *pdev)
363{363{
364 struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);364 struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
365 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);365 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -426,7 +426,7 @@ MODULE_DEVICE_TABLE(of, omap_wdt_of_match); · 60 unmodified lines
426 426
427static struct platform_driver omap_wdt_driver = {427static struct platform_driver omap_wdt_driver = {
428 .probe = omap_wdt_probe,428 .probe = omap_wdt_probe,
429 .remove = __devexit_p(omap_wdt_remove),429 .remove = omap_wdt_remove,
430 .shutdown = omap_wdt_shutdown,430 .shutdown = omap_wdt_shutdown,
431 .suspend = omap_wdt_suspend,431 .suspend = omap_wdt_suspend,
432 .resume = omap_wdt_resume,432 .resume = omap_wdt_resume,
drivers/watchdog/orion_wdt.c+4−4
@@ -142,7 +142,7 @@ static struct watchdog_device orion_wdt = { · 141 unmodified lines
142 .ops = &orion_wdt_ops,142 .ops = &orion_wdt_ops,
143};143};
144 144
145static int __devinit orion_wdt_probe(struct platform_device *pdev)145static int orion_wdt_probe(struct platform_device *pdev)
146{146{
147 struct resource *res;147 struct resource *res;
148 int ret;148 int ret;
@@ -181,7 +181,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) · 32 unmodified lines
181 return 0;181 return 0;
182}182}
183 183
184static int __devexit orion_wdt_remove(struct platform_device *pdev)184static int orion_wdt_remove(struct platform_device *pdev)
185{185{
186 watchdog_unregister_device(&orion_wdt);186 watchdog_unregister_device(&orion_wdt);
187 clk_disable_unprepare(clk);187 clk_disable_unprepare(clk);
@@ -193,7 +193,7 @@ static void orion_wdt_shutdown(struct platform_device *pdev) · 5 unmodified lines
193 orion_wdt_stop(&orion_wdt);193 orion_wdt_stop(&orion_wdt);
194}194}
195 195
196static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = {196static const struct of_device_id orion_wdt_of_match_table[] = {
197 { .compatible = "marvell,orion-wdt", },197 { .compatible = "marvell,orion-wdt", },
198 {},198 {},
199};199};
@@ -201,7 +201,7 @@ MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table); · 1 unmodified line
201 201
202static struct platform_driver orion_wdt_driver = {202static struct platform_driver orion_wdt_driver = {
203 .probe = orion_wdt_probe,203 .probe = orion_wdt_probe,
204 .remove = __devexit_p(orion_wdt_remove),204 .remove = orion_wdt_remove,
205 .shutdown = orion_wdt_shutdown,205 .shutdown = orion_wdt_shutdown,
206 .driver = {206 .driver = {
207 .owner = THIS_MODULE,207 .owner = THIS_MODULE,
drivers/watchdog/pcwd.c+4−4
@@ -801,7 +801,7 @@ static inline int get_revision(void) · 800 unmodified lines
801 * The initial rate is once per second at board start up, then twice801 * The initial rate is once per second at board start up, then twice
802 * per second for normal operation.802 * per second for normal operation.
803 */803 */
804static int __devinit pcwd_isa_match(struct device *dev, unsigned int id)804static int pcwd_isa_match(struct device *dev, unsigned int id)
805{805{
806 int base_addr = pcwd_ioports[id];806 int base_addr = pcwd_ioports[id];
807 int port0, last_port0; /* Reg 0, in case it's REV A */807 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) · 38 unmodified lines
846 return retval;846 return retval;
847}847}
848 848
849static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id)849static int pcwd_isa_probe(struct device *dev, unsigned int id)
850{850{
851 int ret;851 int ret;
852 852
@@ -949,7 +949,7 @@ error_request_region: · 96 unmodified lines
949 return ret;949 return ret;
950}950}
951 951
952static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id)952static int pcwd_isa_remove(struct device *dev, unsigned int id)
953{953{
954 if (debug >= DEBUG)954 if (debug >= DEBUG)
955 pr_debug("pcwd_isa_remove id=%d\n", id);955 pr_debug("pcwd_isa_remove id=%d\n", id);
@@ -984,7 +984,7 @@ static void pcwd_isa_shutdown(struct device *dev, unsigned int id) · 28 unmodified lines
984static struct isa_driver pcwd_isa_driver = {984static struct isa_driver pcwd_isa_driver = {
985 .match = pcwd_isa_match,985 .match = pcwd_isa_match,
986 .probe = pcwd_isa_probe,986 .probe = pcwd_isa_probe,
987 .remove = __devexit_p(pcwd_isa_remove),987 .remove = pcwd_isa_remove,
988 .shutdown = pcwd_isa_shutdown,988 .shutdown = pcwd_isa_shutdown,
989 .driver = {989 .driver = {
990 .owner = THIS_MODULE,990 .owner = THIS_MODULE,
drivers/watchdog/pcwd_pci.c+3−3
@@ -682,7 +682,7 @@ static struct notifier_block pcipcwd_notifier = { · 681 unmodified lines
682 * Init & exit routines682 * Init & exit routines
683 */683 */
684 684
685static int __devinit pcipcwd_card_init(struct pci_dev *pdev,685static int pcipcwd_card_init(struct pci_dev *pdev,
686 const struct pci_device_id *ent)686 const struct pci_device_id *ent)
687{687{
688 int ret = -EIO;688 int ret = -EIO;
@@ -785,7 +785,7 @@ err_out_disable_device: · 96 unmodified lines
785 return ret;785 return ret;
786}786}
787 787
788static void __devexit pcipcwd_card_exit(struct pci_dev *pdev)788static void pcipcwd_card_exit(struct pci_dev *pdev)
789{789{
790 /* Stop the timer before we leave */790 /* Stop the timer before we leave */
791 if (!nowayout)791 if (!nowayout)
@@ -812,7 +812,7 @@ static struct pci_driver pcipcwd_driver = { · 20 unmodified lines
812 .name = WATCHDOG_NAME,812 .name = WATCHDOG_NAME,
813 .id_table = pcipcwd_pci_tbl,813 .id_table = pcipcwd_pci_tbl,
814 .probe = pcipcwd_card_init,814 .probe = pcipcwd_card_init,
815 .remove = __devexit_p(pcipcwd_card_exit),815 .remove = pcipcwd_card_exit,
816};816};
817 817
818module_pci_driver(pcipcwd_driver);818module_pci_driver(pcipcwd_driver);
drivers/watchdog/pnx4008_wdt.c+3−3
@@ -146,7 +146,7 @@ static struct watchdog_device pnx4008_wdd = { · 145 unmodified lines
146 .max_timeout = MAX_HEARTBEAT,146 .max_timeout = MAX_HEARTBEAT,
147};147};
148 148
149static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)149static int pnx4008_wdt_probe(struct platform_device *pdev)
150{150{
151 struct resource *r;151 struct resource *r;
152 int ret = 0;152 int ret = 0;
@@ -192,7 +192,7 @@ out: · 39 unmodified lines
192 return ret;192 return ret;
193}193}
194 194
195static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)195static int pnx4008_wdt_remove(struct platform_device *pdev)
196{196{
197 watchdog_unregister_device(&pnx4008_wdd);197 watchdog_unregister_device(&pnx4008_wdd);
198 198
@@ -217,7 +217,7 @@ static struct platform_driver platform_wdt_driver = { · 18 unmodified lines
217 .of_match_table = of_match_ptr(pnx4008_wdt_match),217 .of_match_table = of_match_ptr(pnx4008_wdt_match),
218 },218 },
219 .probe = pnx4008_wdt_probe,219 .probe = pnx4008_wdt_probe,
220 .remove = __devexit_p(pnx4008_wdt_remove),220 .remove = pnx4008_wdt_remove,
221};221};
222 222
223module_platform_driver(platform_wdt_driver);223module_platform_driver(platform_wdt_driver);
drivers/watchdog/rc32434_wdt.c+3−3
@@ -260,7 +260,7 @@ static struct miscdevice rc32434_wdt_miscdev = { · 259 unmodified lines
260 .fops = &rc32434_wdt_fops,260 .fops = &rc32434_wdt_fops,
261};261};
262 262
263static int __devinit rc32434_wdt_probe(struct platform_device *pdev)263static int rc32434_wdt_probe(struct platform_device *pdev)
264{264{
265 int ret;265 int ret;
266 struct resource *r;266 struct resource *r;
@@ -306,7 +306,7 @@ unmap: · 39 unmodified lines
306 return ret;306 return ret;
307}307}
308 308
309static int __devexit rc32434_wdt_remove(struct platform_device *pdev)309static int rc32434_wdt_remove(struct platform_device *pdev)
310{310{
311 misc_deregister(&rc32434_wdt_miscdev);311 misc_deregister(&rc32434_wdt_miscdev);
312 iounmap(wdt_reg);312 iounmap(wdt_reg);
@@ -320,7 +320,7 @@ static void rc32434_wdt_shutdown(struct platform_device *pdev) · 7 unmodified lines
320 320
321static struct platform_driver rc32434_wdt_driver = {321static struct platform_driver rc32434_wdt_driver = {
322 .probe = rc32434_wdt_probe,322 .probe = rc32434_wdt_probe,
323 .remove = __devexit_p(rc32434_wdt_remove),323 .remove = rc32434_wdt_remove,
324 .shutdown = rc32434_wdt_shutdown,324 .shutdown = rc32434_wdt_shutdown,
325 .driver = {325 .driver = {
326 .name = "rc32434_wdt",326 .name = "rc32434_wdt",
drivers/watchdog/rdc321x_wdt.c+3−3
@@ -225,7 +225,7 @@ static struct miscdevice rdc321x_wdt_misc = { · 224 unmodified lines
225 .fops = &rdc321x_wdt_fops,225 .fops = &rdc321x_wdt_fops,
226};226};
227 227
228static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)228static int rdc321x_wdt_probe(struct platform_device *pdev)
229{229{
230 int err;230 int err;
231 struct resource *r;231 struct resource *r;
@@ -272,7 +272,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) · 40 unmodified lines
272 return 0;272 return 0;
273}273}
274 274
275static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)275static int rdc321x_wdt_remove(struct platform_device *pdev)
276{276{
277 if (rdc321x_wdt_device.queue) {277 if (rdc321x_wdt_device.queue) {
278 rdc321x_wdt_device.queue = 0;278 rdc321x_wdt_device.queue = 0;
@@ -286,7 +286,7 @@ static int __devexit rdc321x_wdt_remove(struct platform_device *pdev) · 7 unmodified lines
286 286
287static struct platform_driver rdc321x_wdt_driver = {287static struct platform_driver rdc321x_wdt_driver = {
288 .probe = rdc321x_wdt_probe,288 .probe = rdc321x_wdt_probe,
289 .remove = __devexit_p(rdc321x_wdt_remove),289 .remove = rdc321x_wdt_remove,
290 .driver = {290 .driver = {
291 .owner = THIS_MODULE,291 .owner = THIS_MODULE,
292 .name = "rdc321x-wdt",292 .name = "rdc321x-wdt",
drivers/watchdog/riowd.c+3−3
@@ -174,7 +174,7 @@ static struct miscdevice riowd_miscdev = { · 173 unmodified lines
174 .fops = &riowd_fops174 .fops = &riowd_fops
175};175};
176 176
177static int __devinit riowd_probe(struct platform_device *op)177static int riowd_probe(struct platform_device *op)
178{178{
179 struct riowd *p;179 struct riowd *p;
180 int err = -EINVAL;180 int err = -EINVAL;
@@ -220,7 +220,7 @@ out: · 39 unmodified lines
220 return err;220 return err;
221}221}
222 222
223static int __devexit riowd_remove(struct platform_device *op)223static int riowd_remove(struct platform_device *op)
224{224{
225 struct riowd *p = dev_get_drvdata(&op->dev);225 struct riowd *p = dev_get_drvdata(&op->dev);
226 226
@@ -246,7 +246,7 @@ static struct platform_driver riowd_driver = { · 19 unmodified lines
246 .of_match_table = riowd_match,246 .of_match_table = riowd_match,
247 },247 },
248 .probe = riowd_probe,248 .probe = riowd_probe,
249 .remove = __devexit_p(riowd_remove),249 .remove = riowd_remove,
250};250};
251 251
252module_platform_driver(riowd_driver);252module_platform_driver(riowd_driver);
drivers/watchdog/s3c2410_wdt.c+3−3
@@ -303,7 +303,7 @@ static inline void s3c2410wdt_cpufreq_deregister(void) · 302 unmodified lines
303}303}
304#endif304#endif
305 305
306static int __devinit s3c2410wdt_probe(struct platform_device *pdev)306static int s3c2410wdt_probe(struct platform_device *pdev)
307{307{
308 struct device *dev;308 struct device *dev;
309 unsigned int wtcon;309 unsigned int wtcon;
@@ -437,7 +437,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) · 127 unmodified lines
437 return ret;437 return ret;
438}438}
439 439
440static int __devexit s3c2410wdt_remove(struct platform_device *dev)440static int s3c2410wdt_remove(struct platform_device *dev)
441{441{
442 watchdog_unregister_device(&s3c2410_wdd);442 watchdog_unregister_device(&s3c2410_wdd);
443 443
@@ -508,7 +508,7 @@ MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); · 64 unmodified lines
508 508
509static struct platform_driver s3c2410wdt_driver = {509static struct platform_driver s3c2410wdt_driver = {
510 .probe = s3c2410wdt_probe,510 .probe = s3c2410wdt_probe,
511 .remove = __devexit_p(s3c2410wdt_remove),511 .remove = s3c2410wdt_remove,
512 .shutdown = s3c2410wdt_shutdown,512 .shutdown = s3c2410wdt_shutdown,
513 .suspend = s3c2410wdt_suspend,513 .suspend = s3c2410wdt_suspend,
514 .resume = s3c2410wdt_resume,514 .resume = s3c2410wdt_resume,
drivers/watchdog/sch311x_wdt.c+3−3
@@ -356,7 +356,7 @@ static struct miscdevice sch311x_wdt_miscdev = { · 355 unmodified lines
356 * Init & exit routines356 * Init & exit routines
357 */357 */
358 358
359static int __devinit sch311x_wdt_probe(struct platform_device *pdev)359static int sch311x_wdt_probe(struct platform_device *pdev)
360{360{
361 struct device *dev = &pdev->dev;361 struct device *dev = &pdev->dev;
362 int err;362 int err;
@@ -429,7 +429,7 @@ exit: · 66 unmodified lines
429 return err;429 return err;
430}430}
431 431
432static int __devexit sch311x_wdt_remove(struct platform_device *pdev)432static int sch311x_wdt_remove(struct platform_device *pdev)
433{433{
434 /* Stop the timer before we leave */434 /* Stop the timer before we leave */
435 if (!nowayout)435 if (!nowayout)
@@ -451,7 +451,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev) · 15 unmodified lines
451 451
452static struct platform_driver sch311x_wdt_driver = {452static struct platform_driver sch311x_wdt_driver = {
453 .probe = sch311x_wdt_probe,453 .probe = sch311x_wdt_probe,
454 .remove = __devexit_p(sch311x_wdt_remove),454 .remove = sch311x_wdt_remove,
455 .shutdown = sch311x_wdt_shutdown,455 .shutdown = sch311x_wdt_shutdown,
456 .driver = {456 .driver = {
457 .owner = THIS_MODULE,457 .owner = THIS_MODULE,
drivers/watchdog/shwdt.c+3−3
@@ -217,7 +217,7 @@ static struct watchdog_device sh_wdt_dev = { · 216 unmodified lines
217 .ops = &sh_wdt_ops,217 .ops = &sh_wdt_ops,
218};218};
219 219
220static int __devinit sh_wdt_probe(struct platform_device *pdev)220static int sh_wdt_probe(struct platform_device *pdev)
221{221{
222 struct sh_wdt *wdt;222 struct sh_wdt *wdt;
223 struct resource *res;223 struct resource *res;
@@ -298,7 +298,7 @@ err: · 74 unmodified lines
298 return rc;298 return rc;
299}299}
300 300
301static int __devexit sh_wdt_remove(struct platform_device *pdev)301static int sh_wdt_remove(struct platform_device *pdev)
302{302{
303 struct sh_wdt *wdt = platform_get_drvdata(pdev);303 struct sh_wdt *wdt = platform_get_drvdata(pdev);
304 304
@@ -324,7 +324,7 @@ static struct platform_driver sh_wdt_driver = { · 19 unmodified lines
324 },324 },
325 325
326 .probe = sh_wdt_probe,326 .probe = sh_wdt_probe,
327 .remove = __devexit_p(sh_wdt_remove),327 .remove = sh_wdt_remove,
328 .shutdown = sh_wdt_shutdown,328 .shutdown = sh_wdt_shutdown,
329};329};
330 330
drivers/watchdog/sp5100_tco.c+5−5
@@ -271,7 +271,7 @@ MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl); · 270 unmodified lines
271 * Init & exit routines271 * Init & exit routines
272 */272 */
273 273
274static unsigned char __devinit sp5100_tco_setupdevice(void)274static unsigned char sp5100_tco_setupdevice(void)
275{275{
276 struct pci_dev *dev = NULL;276 struct pci_dev *dev = NULL;
277 u32 val;277 u32 val;
@@ -361,7 +361,7 @@ exit: · 83 unmodified lines
361 return 0;361 return 0;
362}362}
363 363
364static int __devinit sp5100_tco_init(struct platform_device *dev)364static int sp5100_tco_init(struct platform_device *dev)
365{365{
366 int ret;366 int ret;
367 u32 val;367 u32 val;
@@ -412,7 +412,7 @@ exit: · 44 unmodified lines
412 return ret;412 return ret;
413}413}
414 414
415static void __devexit sp5100_tco_cleanup(void)415static void sp5100_tco_cleanup(void)
416{416{
417 /* Stop the timer before we leave */417 /* Stop the timer before we leave */
418 if (!nowayout)418 if (!nowayout)
@@ -425,7 +425,7 @@ static void __devexit sp5100_tco_cleanup(void) · 6 unmodified lines
425 release_region(pm_iobase, SP5100_PM_IOPORTS_SIZE);425 release_region(pm_iobase, SP5100_PM_IOPORTS_SIZE);
426}426}
427 427
428static int __devexit sp5100_tco_remove(struct platform_device *dev)428static int sp5100_tco_remove(struct platform_device *dev)
429{429{
430 if (tcobase)430 if (tcobase)
431 sp5100_tco_cleanup();431 sp5100_tco_cleanup();
@@ -439,7 +439,7 @@ static void sp5100_tco_shutdown(struct platform_device *dev) · 7 unmodified lines
439 439
440static struct platform_driver sp5100_tco_driver = {440static struct platform_driver sp5100_tco_driver = {
441 .probe = sp5100_tco_init,441 .probe = sp5100_tco_init,
442 .remove = __devexit_p(sp5100_tco_remove),442 .remove = sp5100_tco_remove,
443 .shutdown = sp5100_tco_shutdown,443 .shutdown = sp5100_tco_shutdown,
444 .driver = {444 .driver = {
445 .owner = THIS_MODULE,445 .owner = THIS_MODULE,
drivers/watchdog/sp805_wdt.c+3−3
@@ -210,7 +210,7 @@ static const struct watchdog_ops wdt_ops = { · 209 unmodified lines
210 .get_timeleft = wdt_timeleft,210 .get_timeleft = wdt_timeleft,
211};211};
212 212
213static int __devinit213static int
214sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)214sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
215{215{
216 struct sp805_wdt *wdt;216 struct sp805_wdt *wdt;
@@ -272,7 +272,7 @@ err: · 55 unmodified lines
272 return ret;272 return ret;
273}273}
274 274
275static int __devexit sp805_wdt_remove(struct amba_device *adev)275static int sp805_wdt_remove(struct amba_device *adev)
276{276{
277 struct sp805_wdt *wdt = amba_get_drvdata(adev);277 struct sp805_wdt *wdt = amba_get_drvdata(adev);
278 278
@@ -326,7 +326,7 @@ static struct amba_driver sp805_wdt_driver = { · 47 unmodified lines
326 },326 },
327 .id_table = sp805_wdt_ids,327 .id_table = sp805_wdt_ids,
328 .probe = sp805_wdt_probe,328 .probe = sp805_wdt_probe,
329 .remove = __devexit_p(sp805_wdt_remove),329 .remove = sp805_wdt_remove,
330};330};
331 331
332module_amba_driver(sp805_wdt_driver);332module_amba_driver(sp805_wdt_driver);
drivers/watchdog/stmp3xxx_wdt.c+3−3
@@ -204,7 +204,7 @@ static struct miscdevice stmp3xxx_wdt_miscdev = { · 203 unmodified lines
204 .fops = &stmp3xxx_wdt_fops,204 .fops = &stmp3xxx_wdt_fops,
205};205};
206 206
207static int __devinit stmp3xxx_wdt_probe(struct platform_device *pdev)207static int stmp3xxx_wdt_probe(struct platform_device *pdev)
208{208{
209 int ret = 0;209 int ret = 0;
210 210
@@ -229,7 +229,7 @@ static int __devinit stmp3xxx_wdt_probe(struct platform_device *pdev) · 18 unmodified lines
229 return ret;229 return ret;
230}230}
231 231
232static int __devexit stmp3xxx_wdt_remove(struct platform_device *pdev)232static int stmp3xxx_wdt_remove(struct platform_device *pdev)
233{233{
234 misc_deregister(&stmp3xxx_wdt_miscdev);234 misc_deregister(&stmp3xxx_wdt_miscdev);
235 return 0;235 return 0;
@@ -269,7 +269,7 @@ static struct platform_driver platform_wdt_driver = { · 33 unmodified lines
269 .name = "stmp3xxx_wdt",269 .name = "stmp3xxx_wdt",
270 },270 },
271 .probe = stmp3xxx_wdt_probe,271 .probe = stmp3xxx_wdt_probe,
272 .remove = __devexit_p(stmp3xxx_wdt_remove),272 .remove = stmp3xxx_wdt_remove,
273 .suspend = stmp3xxx_wdt_suspend,273 .suspend = stmp3xxx_wdt_suspend,
274 .resume = stmp3xxx_wdt_resume,274 .resume = stmp3xxx_wdt_resume,
275};275};
drivers/watchdog/ts72xx_wdt.c+3−3
@@ -390,7 +390,7 @@ static struct miscdevice ts72xx_wdt_miscdev = { · 389 unmodified lines
390 .fops = &ts72xx_wdt_fops,390 .fops = &ts72xx_wdt_fops,
391};391};
392 392
393static __devinit int ts72xx_wdt_probe(struct platform_device *pdev)393static int ts72xx_wdt_probe(struct platform_device *pdev)
394{394{
395 struct ts72xx_wdt *wdt;395 struct ts72xx_wdt *wdt;
396 struct resource *r1, *r2;396 struct resource *r1, *r2;
@@ -476,7 +476,7 @@ fail: · 79 unmodified lines
476 return error;476 return error;
477}477}
478 478
479static __devexit int ts72xx_wdt_remove(struct platform_device *pdev)479static int ts72xx_wdt_remove(struct platform_device *pdev)
480{480{
481 struct ts72xx_wdt *wdt = platform_get_drvdata(pdev);481 struct ts72xx_wdt *wdt = platform_get_drvdata(pdev);
482 struct resource *res;482 struct resource *res;
@@ -499,7 +499,7 @@ static __devexit int ts72xx_wdt_remove(struct platform_device *pdev) · 16 unmodified lines
499 499
500static struct platform_driver ts72xx_wdt_driver = {500static struct platform_driver ts72xx_wdt_driver = {
501 .probe = ts72xx_wdt_probe,501 .probe = ts72xx_wdt_probe,
502 .remove = __devexit_p(ts72xx_wdt_remove),502 .remove = ts72xx_wdt_remove,
503 .driver = {503 .driver = {
504 .name = "ts72xx-wdt",504 .name = "ts72xx-wdt",
505 .owner = THIS_MODULE,505 .owner = THIS_MODULE,
drivers/watchdog/twl4030_wdt.c+3−3
@@ -170,7 +170,7 @@ static const struct file_operations twl4030_wdt_fops = { · 169 unmodified lines
170 .write = twl4030_wdt_write_fop,170 .write = twl4030_wdt_write_fop,
171};171};
172 172
173static int __devinit twl4030_wdt_probe(struct platform_device *pdev)173static int twl4030_wdt_probe(struct platform_device *pdev)
174{174{
175 int ret = 0;175 int ret = 0;
176 struct twl4030_wdt *wdt;176 struct twl4030_wdt *wdt;
@@ -204,7 +204,7 @@ static int __devinit twl4030_wdt_probe(struct platform_device *pdev) · 27 unmodified lines
204 return 0;204 return 0;
205}205}
206 206
207static int __devexit twl4030_wdt_remove(struct platform_device *pdev)207static int twl4030_wdt_remove(struct platform_device *pdev)
208{208{
209 struct twl4030_wdt *wdt = platform_get_drvdata(pdev);209 struct twl4030_wdt *wdt = platform_get_drvdata(pdev);
210 210
@@ -247,7 +247,7 @@ static int twl4030_wdt_resume(struct platform_device *pdev) · 36 unmodified lines
247 247
248static struct platform_driver twl4030_wdt_driver = {248static struct platform_driver twl4030_wdt_driver = {
249 .probe = twl4030_wdt_probe,249 .probe = twl4030_wdt_probe,
250 .remove = __devexit_p(twl4030_wdt_remove),250 .remove = twl4030_wdt_remove,
251 .suspend = twl4030_wdt_suspend,251 .suspend = twl4030_wdt_suspend,
252 .resume = twl4030_wdt_resume,252 .resume = twl4030_wdt_resume,
253 .driver = {253 .driver = {
drivers/watchdog/via_wdt.c+3−3
@@ -155,7 +155,7 @@ static struct watchdog_device wdt_dev = { · 154 unmodified lines
155 .max_timeout = WDT_TIMEOUT_MAX,155 .max_timeout = WDT_TIMEOUT_MAX,
156};156};
157 157
158static int __devinit wdt_probe(struct pci_dev *pdev,158static int wdt_probe(struct pci_dev *pdev,
159 const struct pci_device_id *ent)159 const struct pci_device_id *ent)
160{160{
161 unsigned char conf;161 unsigned char conf;
@@ -229,7 +229,7 @@ err_out_disable_device: · 67 unmodified lines
229 return ret;229 return ret;
230}230}
231 231
232static void __devexit wdt_remove(struct pci_dev *pdev)232static void wdt_remove(struct pci_dev *pdev)
233{233{
234 watchdog_unregister_device(&wdt_dev);234 watchdog_unregister_device(&wdt_dev);
235 del_timer(&timer);235 del_timer(&timer);
@@ -250,7 +250,7 @@ static struct pci_driver wdt_driver = { · 14 unmodified lines
250 .name = "via_wdt",250 .name = "via_wdt",
251 .id_table = wdt_pci_table,251 .id_table = wdt_pci_table,
252 .probe = wdt_probe,252 .probe = wdt_probe,
253 .remove = __devexit_p(wdt_remove),253 .remove = wdt_remove,
254};254};
255 255
256module_pci_driver(wdt_driver);256module_pci_driver(wdt_driver);
drivers/watchdog/wdt_pci.c+3−3
@@ -605,7 +605,7 @@ static struct notifier_block wdtpci_notifier = { · 604 unmodified lines
605};605};
606 606
607 607
608static int __devinit wdtpci_init_one(struct pci_dev *dev,608static int wdtpci_init_one(struct pci_dev *dev,
609 const struct pci_device_id *ent)609 const struct pci_device_id *ent)
610{610{
611 int ret = -EIO;611 int ret = -EIO;
@@ -705,7 +705,7 @@ out_pci: · 93 unmodified lines
705}705}
706 706
707 707
708static void __devexit wdtpci_remove_one(struct pci_dev *pdev)708static void wdtpci_remove_one(struct pci_dev *pdev)
709{709{
710 /* here we assume only one device will ever have710 /* here we assume only one device will ever have
711 * been picked up and registered by probe function */711 * been picked up and registered by probe function */
@@ -736,7 +736,7 @@ static struct pci_driver wdtpci_driver = { · 24 unmodified lines
736 .name = "wdt_pci",736 .name = "wdt_pci",
737 .id_table = wdtpci_pci_tbl,737 .id_table = wdtpci_pci_tbl,
738 .probe = wdtpci_init_one,738 .probe = wdtpci_init_one,
739 .remove = __devexit_p(wdtpci_remove_one),739 .remove = wdtpci_remove_one,
740};740};
741 741
742module_pci_driver(wdtpci_driver);742module_pci_driver(wdtpci_driver);
drivers/watchdog/wm831x_wdt.c+3−3
@@ -181,7 +181,7 @@ static const struct watchdog_ops wm831x_wdt_ops = { · 180 unmodified lines
181 .set_timeout = wm831x_wdt_set_timeout,181 .set_timeout = wm831x_wdt_set_timeout,
182};182};
183 183
184static int __devinit wm831x_wdt_probe(struct platform_device *pdev)184static int wm831x_wdt_probe(struct platform_device *pdev)
185{185{
186 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);186 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
187 struct wm831x_pdata *chip_pdata;187 struct wm831x_pdata *chip_pdata;
@@ -292,7 +292,7 @@ err: · 104 unmodified lines
292 return ret;292 return ret;
293}293}
294 294
295static int __devexit wm831x_wdt_remove(struct platform_device *pdev)295static int wm831x_wdt_remove(struct platform_device *pdev)
296{296{
297 struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);297 struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
298 298
@@ -306,7 +306,7 @@ static int __devexit wm831x_wdt_remove(struct platform_device *pdev) · 7 unmodified lines
306 306
307static struct platform_driver wm831x_wdt_driver = {307static struct platform_driver wm831x_wdt_driver = {
308 .probe = wm831x_wdt_probe,308 .probe = wm831x_wdt_probe,
309 .remove = __devexit_p(wm831x_wdt_remove),309 .remove = wm831x_wdt_remove,
310 .driver = {310 .driver = {
311 .name = "wm831x-watchdog",311 .name = "wm831x-watchdog",
312 },312 },
drivers/watchdog/wm8350_wdt.c+3−3
@@ -140,7 +140,7 @@ static struct watchdog_device wm8350_wdt = { · 139 unmodified lines
140 .max_timeout = 4,140 .max_timeout = 4,
141};141};
142 142
143static int __devinit wm8350_wdt_probe(struct platform_device *pdev)143static int wm8350_wdt_probe(struct platform_device *pdev)
144{144{
145 struct wm8350 *wm8350 = platform_get_drvdata(pdev);145 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
146 146
@@ -158,7 +158,7 @@ static int __devinit wm8350_wdt_probe(struct platform_device *pdev) · 11 unmodified lines
158 return watchdog_register_device(&wm8350_wdt);158 return watchdog_register_device(&wm8350_wdt);
159}159}
160 160
161static int __devexit wm8350_wdt_remove(struct platform_device *pdev)161static int wm8350_wdt_remove(struct platform_device *pdev)
162{162{
163 watchdog_unregister_device(&wm8350_wdt);163 watchdog_unregister_device(&wm8350_wdt);
164 return 0;164 return 0;
@@ -166,7 +166,7 @@ static int __devexit wm8350_wdt_remove(struct platform_device *pdev) · 1 unmodified line
166 166
167static struct platform_driver wm8350_wdt_driver = {167static struct platform_driver wm8350_wdt_driver = {
168 .probe = wm8350_wdt_probe,168 .probe = wm8350_wdt_probe,
169 .remove = __devexit_p(wm8350_wdt_remove),169 .remove = wm8350_wdt_remove,
170 .driver = {170 .driver = {
171 .name = "wm8350-wdt",171 .name = "wm8350-wdt",
172 },172 },
drivers/watchdog/xen_wdt.c+3−3
@@ -244,7 +244,7 @@ static struct miscdevice xen_wdt_miscdev = { · 243 unmodified lines
244 .fops = &xen_wdt_fops,244 .fops = &xen_wdt_fops,
245};245};
246 246
247static int __devinit xen_wdt_probe(struct platform_device *dev)247static int xen_wdt_probe(struct platform_device *dev)
248{248{
249 struct sched_watchdog wd = { .id = ~0 };249 struct sched_watchdog wd = { .id = ~0 };
250 int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd);250 int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd);
@@ -280,7 +280,7 @@ static int __devinit xen_wdt_probe(struct platform_device *dev) · 29 unmodified lines
280 return ret;280 return ret;
281}281}
282 282
283static int __devexit xen_wdt_remove(struct platform_device *dev)283static int xen_wdt_remove(struct platform_device *dev)
284{284{
285 /* Stop the timer before we leave */285 /* Stop the timer before we leave */
286 if (!nowayout)286 if (!nowayout)
@@ -315,7 +315,7 @@ static int xen_wdt_resume(struct platform_device *dev) · 28 unmodified lines
315 315
316static struct platform_driver xen_wdt_driver = {316static struct platform_driver xen_wdt_driver = {
317 .probe = xen_wdt_probe,317 .probe = xen_wdt_probe,
318 .remove = __devexit_p(xen_wdt_remove),318 .remove = xen_wdt_remove,
319 .shutdown = xen_wdt_shutdown,319 .shutdown = xen_wdt_shutdown,
320 .suspend = xen_wdt_suspend,320 .suspend = xen_wdt_suspend,
321 .resume = xen_wdt_resume,321 .resume = xen_wdt_resume,
fs/debugfs/inode.c+0−1
@@ -59,7 +59,6 @@ static struct inode *debugfs_get_inode(struct super_block *sb, umode_t mode, dev · 58 unmodified lines
59 case S_IFDIR:59 case S_IFDIR:
60 inode->i_op = &simple_dir_inode_operations;60 inode->i_op = &simple_dir_inode_operations;
61 inode->i_fop = &simple_dir_operations;61 inode->i_fop = &simple_dir_operations;
62 inode->i_private = NULL;
63 62
64 /* directory inodes start off with i_nlink == 263 /* directory inodes start off with i_nlink == 2
65 * (for "." entry) */64 * (for "." entry) */
fs/sysfs/file.c+2−2
@@ -485,8 +485,8 @@ const struct file_operations sysfs_file_operations = { · 484 unmodified lines
485 .poll = sysfs_poll,485 .poll = sysfs_poll,
486};486};
487 487
488int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr,488static int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr,
489 const void **pns)489 const void **pns)
490{490{
491 struct sysfs_dirent *dir_sd = kobj->sd;491 struct sysfs_dirent *dir_sd = kobj->sd;
492 const struct sysfs_ops *ops;492 const struct sysfs_ops *ops;
include/linux/init.h+7−11
@@ -93,13 +93,13 @@ · 92 unmodified lines
93 93
94#define __exit __section(.exit.text) __exitused __cold notrace94#define __exit __section(.exit.text) __exitused __cold notrace
95 95
96/* Used for HOTPLUG */96/* Used for HOTPLUG, but that is always enabled now, so just make them noops */
97#define __devinit __section(.devinit.text) __cold notrace97#define __devinit
98#define __devinitdata __section(.devinit.data)98#define __devinitdata
99#define __devinitconst __constsection(.devinit.rodata)99#define __devinitconst
100#define __devexit __section(.devexit.text) __exitused __cold notrace100#define __devexit
101#define __devexitdata __section(.devexit.data)101#define __devexitdata
102#define __devexitconst __constsection(.devexit.rodata)102#define __devexitconst
103 103
104/* Used for HOTPLUG_CPU */104/* Used for HOTPLUG_CPU */
105#define __cpuinit __section(.cpuinit.text) __cold notrace105#define __cpuinit __section(.cpuinit.text) __cold notrace
@@ -126,10 +126,6 @@ · 20 unmodified lines
126#define __INITRODATA .section ".init.rodata","a",%progbits126#define __INITRODATA .section ".init.rodata","a",%progbits
127#define __FINITDATA .previous127#define __FINITDATA .previous
128 128
129#define __DEVINIT .section ".devinit.text", "ax"
130#define __DEVINITDATA .section ".devinit.data", "aw"
131#define __DEVINITRODATA .section ".devinit.rodata", "a"
132
133#define __CPUINIT .section ".cpuinit.text", "ax"129#define __CPUINIT .section ".cpuinit.text", "ax"
134#define __CPUINITDATA .section ".cpuinit.data", "aw"130#define __CPUINITDATA .section ".cpuinit.data", "aw"
135#define __CPUINITRODATA .section ".cpuinit.rodata", "a"131#define __CPUINITRODATA .section ".cpuinit.rodata", "a"
include/linux/kobject.h+0−18
@@ -203,7 +203,6 @@ extern struct kobject *power_kobj; · 202 unmodified lines
203/* The global /sys/firmware/ kobject for people to chain off of */203/* The global /sys/firmware/ kobject for people to chain off of */
204extern struct kobject *firmware_kobj;204extern struct kobject *firmware_kobj;
205 205
206#if defined(CONFIG_HOTPLUG)
207int kobject_uevent(struct kobject *kobj, enum kobject_action action);206int kobject_uevent(struct kobject *kobj, enum kobject_action action);
208int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,207int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
209 char *envp[]);208 char *envp[]);
@@ -213,22 +212,5 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...); · 3 unmodified lines
213 212
214int kobject_action_type(const char *buf, size_t count,213int kobject_action_type(const char *buf, size_t count,
215 enum kobject_action *type);214 enum kobject_action *type);
216#else
217static inline int kobject_uevent(struct kobject *kobj,
218 enum kobject_action action)
219{ return 0; }
220static inline int kobject_uevent_env(struct kobject *kobj,
221 enum kobject_action action,
222 char *envp[])
223{ return 0; }
224
225static inline __printf(2, 3)
226int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
227{ return -ENOMEM; }
228
229static inline int kobject_action_type(const char *buf, size_t count,
230 enum kobject_action *type)
231{ return -EINVAL; }
232#endif
233 215
234#endif /* _KOBJECT_H_ */216#endif /* _KOBJECT_H_ */
include/linux/mfd/88pm80x.h+1−1
@@ -364,6 +364,6 @@ static inline int pm80x_dev_resume(struct device *dev) · 363 unmodified lines
364#endif364#endif
365 365
366extern int pm80x_init(struct i2c_client *client,366extern int pm80x_init(struct i2c_client *client,
367 const struct i2c_device_id *id) __devinit;367 const struct i2c_device_id *id);
368extern int pm80x_deinit(struct i2c_client *client);368extern int pm80x_deinit(struct i2c_client *client);
369#endif /* __LINUX_MFD_88PM80X_H */369#endif /* __LINUX_MFD_88PM80X_H */
include/linux/mfd/abx500/ab8500.h+2−2
@@ -291,9 +291,9 @@ struct ab8500_platform_data { · 290 unmodified lines
291 struct ab8500_codec_platform_data *codec;291 struct ab8500_codec_platform_data *codec;
292};292};
293 293
294extern int __devinit ab8500_init(struct ab8500 *ab8500,294extern int ab8500_init(struct ab8500 *ab8500,
295 enum ab8500_version version);295 enum ab8500_version version);
296extern int __devexit ab8500_exit(struct ab8500 *ab8500);296extern int ab8500_exit(struct ab8500 *ab8500);
297 297
298extern int ab8500_suspend(struct ab8500 *ab8500);298extern int ab8500_suspend(struct ab8500 *ab8500);
299 299
include/linux/mfd/pm8xxx/irq.h+4−4
@@ -37,21 +37,21 @@ struct pm_irq_chip; · 36 unmodified lines
37 37
38#ifdef CONFIG_MFD_PM8XXX_IRQ38#ifdef CONFIG_MFD_PM8XXX_IRQ
39int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq);39int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq);
40struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev,40struct pm_irq_chip *pm8xxx_irq_init(struct device *dev,
41 const struct pm8xxx_irq_platform_data *pdata);41 const struct pm8xxx_irq_platform_data *pdata);
42int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip);42int pm8xxx_irq_exit(struct pm_irq_chip *chip);
43#else43#else
44static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq)44static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq)
45{45{
46 return -ENXIO;46 return -ENXIO;
47}47}
48static inline struct pm_irq_chip * __devinit pm8xxx_irq_init(48static inline struct pm_irq_chip *pm8xxx_irq_init(
49 const struct device *dev,49 const struct device *dev,
50 const struct pm8xxx_irq_platform_data *pdata)50 const struct pm8xxx_irq_platform_data *pdata)
51{51{
52 return ERR_PTR(-ENXIO);52 return ERR_PTR(-ENXIO);
53}53}
54static inline int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip)54static inline int pm8xxx_irq_exit(struct pm_irq_chip *chip)
55{55{
56 return -ENXIO;56 return -ENXIO;
57}57}
include/linux/pci.h+3−5
@@ -588,7 +588,7 @@ struct pci_driver { · 587 unmodified lines
588 * in a generic manner.588 * in a generic manner.
589 */589 */
590#define DEFINE_PCI_DEVICE_TABLE(_table) \590#define DEFINE_PCI_DEVICE_TABLE(_table) \
591 const struct pci_device_id _table[] __devinitconst591 const struct pci_device_id _table[]
592 592
593/**593/**
594 * PCI_DEVICE - macro used to describe a specific pci device594 * PCI_DEVICE - macro used to describe a specific pci device
@@ -686,7 +686,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, · 91 unmodified lines
686int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);686int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);
687int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);687int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);
688void pci_bus_release_busn_res(struct pci_bus *b);688void pci_bus_release_busn_res(struct pci_bus *b);
689struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,689struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
690 struct pci_ops *ops, void *sysdata,690 struct pci_ops *ops, void *sysdata,
691 struct list_head *resources);691 struct list_head *resources);
692struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,692struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
@@ -941,10 +941,8 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev); · 248 unmodified lines
941 941
942/* Functions for PCI Hotplug drivers to use */942/* Functions for PCI Hotplug drivers to use */
943int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);943int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
944#ifdef CONFIG_HOTPLUG
945unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge);944unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge);
946unsigned int pci_rescan_bus(struct pci_bus *bus);945unsigned int pci_rescan_bus(struct pci_bus *bus);
947#endif
948 946
949/* Vital product data routines */947/* Vital product data routines */
950ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);948ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
@@ -1580,7 +1578,7 @@ extern int pci_pci_problems; · 629 unmodified lines
1580 1578
1581extern unsigned long pci_cardbus_io_size;1579extern unsigned long pci_cardbus_io_size;
1582extern unsigned long pci_cardbus_mem_size;1580extern unsigned long pci_cardbus_mem_size;
1583extern u8 __devinitdata pci_dfl_cache_line_size;1581extern u8 pci_dfl_cache_line_size;
1584extern u8 pci_cache_line_size;1582extern u8 pci_cache_line_size;
1585 1583
1586extern unsigned long pci_hotplug_io_size;1584extern unsigned long pci_hotplug_io_size;
kernel/ksysfs.c+1−4
@@ -26,7 +26,6 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) · 25 unmodified lines
26static struct kobj_attribute _name##_attr = \26static struct kobj_attribute _name##_attr = \
27 __ATTR(_name, 0644, _name##_show, _name##_store)27 __ATTR(_name, 0644, _name##_show, _name##_store)
28 28
29#if defined(CONFIG_HOTPLUG)
30/* current uevent sequence number */29/* current uevent sequence number */
31static ssize_t uevent_seqnum_show(struct kobject *kobj,30static ssize_t uevent_seqnum_show(struct kobject *kobj,
32 struct kobj_attribute *attr, char *buf)31 struct kobj_attribute *attr, char *buf)
@@ -54,7 +53,7 @@ static ssize_t uevent_helper_store(struct kobject *kobj, · 21 unmodified lines
54 return count;53 return count;
55}54}
56KERNEL_ATTR_RW(uevent_helper);55KERNEL_ATTR_RW(uevent_helper);
57#endif56
58 57
59#ifdef CONFIG_PROFILING58#ifdef CONFIG_PROFILING
60static ssize_t profiling_show(struct kobject *kobj,59static ssize_t profiling_show(struct kobject *kobj,
@@ -169,10 +168,8 @@ EXPORT_SYMBOL_GPL(kernel_kobj); · 108 unmodified lines
169 168
170static struct attribute * kernel_attrs[] = {169static struct attribute * kernel_attrs[] = {
171 &fscaps_attr.attr,170 &fscaps_attr.attr,
172#if defined(CONFIG_HOTPLUG)
173 &uevent_seqnum_attr.attr,171 &uevent_seqnum_attr.attr,
174 &uevent_helper_attr.attr,172 &uevent_helper_attr.attr,
175#endif
176#ifdef CONFIG_PROFILING173#ifdef CONFIG_PROFILING
177 &profiling_attr.attr,174 &profiling_attr.attr,
178#endif175#endif
kernel/sysctl.c+2−2
@@ -565,7 +565,7 @@ static struct ctl_table kern_table[] = { · 564 unmodified lines
565 .extra2 = &one,565 .extra2 = &one,
566 },566 },
567#endif567#endif
568#ifdef CONFIG_HOTPLUG568
569 {569 {
570 .procname = "hotplug",570 .procname = "hotplug",
571 .data = &uevent_helper,571 .data = &uevent_helper,
@@ -573,7 +573,7 @@ static struct ctl_table kern_table[] = { · 1 unmodified line
573 .mode = 0644,573 .mode = 0644,
574 .proc_handler = proc_dostring,574 .proc_handler = proc_dostring,
575 },575 },
576#endif576
577#ifdef CONFIG_CHR_DEV_SG577#ifdef CONFIG_CHR_DEV_SG
578 {578 {
579 .procname = "sg-big-buff",579 .procname = "sg-big-buff",
lib/Makefile+1−2
@@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ · 11 unmodified lines
12 idr.o int_sqrt.o extable.o \12 idr.o int_sqrt.o extable.o \
13 sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \13 sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
14 proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \14 proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \
15 is_single_threaded.o plist.o decompress.o15 is_single_threaded.o plist.o decompress.o kobject_uevent.o
16 16
17lib-$(CONFIG_MMU) += ioremap.o17lib-$(CONFIG_MMU) += ioremap.o
18lib-$(CONFIG_SMP) += cpumask.o18lib-$(CONFIG_SMP) += cpumask.o
@@ -31,7 +31,6 @@ CFLAGS_kobject.o += -DDEBUG · 12 unmodified lines
31CFLAGS_kobject_uevent.o += -DDEBUG31CFLAGS_kobject_uevent.o += -DDEBUG
32endif32endif
33 33
34lib-$(CONFIG_HOTPLUG) += kobject_uevent.o
35obj-$(CONFIG_GENERIC_IOMAP) += iomap.o34obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
36obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o35obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
37obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o36obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
scripts/mod/modpost.c+10−14
@@ -858,25 +858,23 @@ static void check_section(const char *modname, struct elf_info *elf, · 857 unmodified lines
858 858
859#define ALL_INIT_DATA_SECTIONS \859#define ALL_INIT_DATA_SECTIONS \
860 ".init.setup$", ".init.rodata$", \860 ".init.setup$", ".init.rodata$", \
861 ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$", \861 ".cpuinit.rodata$", ".meminit.rodata$", \
862 ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"862 ".init.data$", ".cpuinit.data$", ".meminit.data$"
863#define ALL_EXIT_DATA_SECTIONS \863#define ALL_EXIT_DATA_SECTIONS \
864 ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"864 ".exit.data$", ".cpuexit.data$", ".memexit.data$"
865 865
866#define ALL_INIT_TEXT_SECTIONS \866#define ALL_INIT_TEXT_SECTIONS \
867 ".init.text$", ".devinit.text$", ".cpuinit.text$", ".meminit.text$"867 ".init.text$", ".cpuinit.text$", ".meminit.text$"
868#define ALL_EXIT_TEXT_SECTIONS \868#define ALL_EXIT_TEXT_SECTIONS \
869 ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"869 ".exit.text$", ".cpuexit.text$", ".memexit.text$"
870 870
871#define ALL_PCI_INIT_SECTIONS \871#define ALL_PCI_INIT_SECTIONS \
872 ".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \872 ".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \
873 ".pci_fixup_enable$", ".pci_fixup_resume$", \873 ".pci_fixup_enable$", ".pci_fixup_resume$", \
874 ".pci_fixup_resume_early$", ".pci_fixup_suspend$"874 ".pci_fixup_resume_early$", ".pci_fixup_suspend$"
875 875
876#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \876#define ALL_XXXINIT_SECTIONS CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
877 MEM_INIT_SECTIONS877#define ALL_XXXEXIT_SECTIONS CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
878#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
879 MEM_EXIT_SECTIONS
880 878
881#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS879#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
882#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS880#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
@@ -885,12 +883,10 @@ static void check_section(const char *modname, struct elf_info *elf, · 2 unmodified lines
885#define TEXT_SECTIONS ".text$"883#define TEXT_SECTIONS ".text$"
886 884
887#define INIT_SECTIONS ".init.*"885#define INIT_SECTIONS ".init.*"
888#define DEV_INIT_SECTIONS ".devinit.*"
889#define CPU_INIT_SECTIONS ".cpuinit.*"886#define CPU_INIT_SECTIONS ".cpuinit.*"
890#define MEM_INIT_SECTIONS ".meminit.*"887#define MEM_INIT_SECTIONS ".meminit.*"
891 888
892#define EXIT_SECTIONS ".exit.*"889#define EXIT_SECTIONS ".exit.*"
893#define DEV_EXIT_SECTIONS ".devexit.*"
894#define CPU_EXIT_SECTIONS ".cpuexit.*"890#define CPU_EXIT_SECTIONS ".cpuexit.*"
895#define MEM_EXIT_SECTIONS ".memexit.*"891#define MEM_EXIT_SECTIONS ".memexit.*"
896 892
@@ -979,7 +975,7 @@ const struct sectioncheck sectioncheck[] = { · 82 unmodified lines
979 .mismatch = DATA_TO_ANY_EXIT,975 .mismatch = DATA_TO_ANY_EXIT,
980 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },976 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
981},977},
982/* Do not reference init code/data from devinit/cpuinit/meminit code/data */978/* Do not reference init code/data from cpuinit/meminit code/data */
983{979{
984 .fromsec = { ALL_XXXINIT_SECTIONS, NULL },980 .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
985 .tosec = { INIT_SECTIONS, NULL },981 .tosec = { INIT_SECTIONS, NULL },
@@ -1000,7 +996,7 @@ const struct sectioncheck sectioncheck[] = { · 14 unmodified lines
1000 .mismatch = XXXINIT_TO_SOME_INIT,996 .mismatch = XXXINIT_TO_SOME_INIT,
1001 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },997 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
1002},998},
1003/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */999/* Do not reference exit code/data from cpuexit/memexit code/data */
1004{1000{
1005 .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },1001 .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
1006 .tosec = { EXIT_SECTIONS, NULL },1002 .tosec = { EXIT_SECTIONS, NULL },
@@ -1089,7 +1085,7 @@ static const struct sectioncheck *section_mismatch( · 82 unmodified lines
1089 * Pattern 2:1085 * Pattern 2:
1090 * Many drivers utilise a *driver container with references to1086 * Many drivers utilise a *driver container with references to
1091 * add, remove, probe functions etc.1087 * add, remove, probe functions etc.
1092 * These functions may often be marked __devinit and we do not want to1088 * These functions may often be marked __cpuinit and we do not want to
1093 * warn here.1089 * warn here.
1094 * the pattern is identified by:1090 * the pattern is identified by:
1095 * tosec = init or exit section1091 * tosec = init or exit section