Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/phy: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
633d1594 45ac936c

+17 -17
+5 -5
drivers/net/phy/mdio-gpio.c
··· 103 103 .get_mdio_data = mdio_get, 104 104 }; 105 105 106 - static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev, 106 + static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 107 107 struct mdio_gpio_platform_data *pdata, 108 108 int bus_id) 109 109 { ··· 173 173 kfree(bitbang); 174 174 } 175 175 176 - static void __devexit mdio_gpio_bus_destroy(struct device *dev) 176 + static void mdio_gpio_bus_destroy(struct device *dev) 177 177 { 178 178 struct mii_bus *bus = dev_get_drvdata(dev); 179 179 ··· 181 181 mdio_gpio_bus_deinit(dev); 182 182 } 183 183 184 - static int __devinit mdio_gpio_probe(struct platform_device *pdev) 184 + static int mdio_gpio_probe(struct platform_device *pdev) 185 185 { 186 186 struct mdio_gpio_platform_data *pdata; 187 187 struct mii_bus *new_bus; ··· 213 213 return ret; 214 214 } 215 215 216 - static int __devexit mdio_gpio_remove(struct platform_device *pdev) 216 + static int mdio_gpio_remove(struct platform_device *pdev) 217 217 { 218 218 mdio_gpio_bus_destroy(&pdev->dev); 219 219 ··· 227 227 228 228 static struct platform_driver mdio_gpio_driver = { 229 229 .probe = mdio_gpio_probe, 230 - .remove = __devexit_p(mdio_gpio_remove), 230 + .remove = mdio_gpio_remove, 231 231 .driver = { 232 232 .name = "mdio-gpio", 233 233 .owner = THIS_MODULE,
+3 -3
drivers/net/phy/mdio-mux-gpio.c
··· 49 49 return 0; 50 50 } 51 51 52 - static int __devinit mdio_mux_gpio_probe(struct platform_device *pdev) 52 + static int mdio_mux_gpio_probe(struct platform_device *pdev) 53 53 { 54 54 enum of_gpio_flags f; 55 55 struct mdio_mux_gpio_state *s; ··· 104 104 return r; 105 105 } 106 106 107 - static int __devexit mdio_mux_gpio_remove(struct platform_device *pdev) 107 + static int mdio_mux_gpio_remove(struct platform_device *pdev) 108 108 { 109 109 struct mdio_mux_gpio_state *s = pdev->dev.platform_data; 110 110 mdio_mux_uninit(s->mux_handle); ··· 130 130 .of_match_table = mdio_mux_gpio_match, 131 131 }, 132 132 .probe = mdio_mux_gpio_probe, 133 - .remove = __devexit_p(mdio_mux_gpio_remove), 133 + .remove = mdio_mux_gpio_remove, 134 134 }; 135 135 136 136 module_platform_driver(mdio_mux_gpio_driver);
+3 -3
drivers/net/phy/mdio-mux-mmioreg.c
··· 67 67 return 0; 68 68 } 69 69 70 - static int __devinit mdio_mux_mmioreg_probe(struct platform_device *pdev) 70 + static int mdio_mux_mmioreg_probe(struct platform_device *pdev) 71 71 { 72 72 struct device_node *np2, *np = pdev->dev.of_node; 73 73 struct mdio_mux_mmioreg_state *s; ··· 137 137 return 0; 138 138 } 139 139 140 - static int __devexit mdio_mux_mmioreg_remove(struct platform_device *pdev) 140 + static int mdio_mux_mmioreg_remove(struct platform_device *pdev) 141 141 { 142 142 struct mdio_mux_mmioreg_state *s = dev_get_platdata(&pdev->dev); 143 143 ··· 161 161 .of_match_table = mdio_mux_mmioreg_match, 162 162 }, 163 163 .probe = mdio_mux_mmioreg_probe, 164 - .remove = __devexit_p(mdio_mux_mmioreg_remove), 164 + .remove = mdio_mux_mmioreg_remove, 165 165 }; 166 166 167 167 module_platform_driver(mdio_mux_mmioreg_driver);
+3 -3
drivers/net/phy/mdio-octeon.c
··· 96 96 return 0; 97 97 } 98 98 99 - static int __devinit octeon_mdiobus_probe(struct platform_device *pdev) 99 + static int octeon_mdiobus_probe(struct platform_device *pdev) 100 100 { 101 101 struct octeon_mdiobus *bus; 102 102 struct resource *res_mem; ··· 159 159 return err; 160 160 } 161 161 162 - static int __devexit octeon_mdiobus_remove(struct platform_device *pdev) 162 + static int octeon_mdiobus_remove(struct platform_device *pdev) 163 163 { 164 164 struct octeon_mdiobus *bus; 165 165 union cvmx_smix_en smi_en; ··· 188 188 .of_match_table = octeon_mdiobus_match, 189 189 }, 190 190 .probe = octeon_mdiobus_probe, 191 - .remove = __devexit_p(octeon_mdiobus_remove), 191 + .remove = octeon_mdiobus_remove, 192 192 }; 193 193 194 194 void octeon_mdiobus_force_mod_depencency(void)
+3 -3
drivers/net/phy/spi_ks8995.c
··· 264 264 265 265 /* ------------------------------------------------------------------------ */ 266 266 267 - static int __devinit ks8995_probe(struct spi_device *spi) 267 + static int ks8995_probe(struct spi_device *spi) 268 268 { 269 269 struct ks8995_switch *ks; 270 270 struct ks8995_pdata *pdata; ··· 332 332 return err; 333 333 } 334 334 335 - static int __devexit ks8995_remove(struct spi_device *spi) 335 + static int ks8995_remove(struct spi_device *spi) 336 336 { 337 337 struct ks8995_data *ks8995; 338 338 ··· 353 353 .owner = THIS_MODULE, 354 354 }, 355 355 .probe = ks8995_probe, 356 - .remove = __devexit_p(ks8995_remove), 356 + .remove = ks8995_remove, 357 357 }; 358 358 359 359 static int __init ks8995_init(void)