Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 633d1594 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45ac936c

drivers/net/phy/mdio-gpio.c

+5 −5
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct mdiobb_ops mdio_gpio_ops = { 
	.get_mdio_data = mdio_get,

};



static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,

static struct mii_bus *mdio_gpio_bus_init(struct device *dev,

					struct mdio_gpio_platform_data *pdata,

					int bus_id)

{
@@ -173,7 +173,7 @@ static void mdio_gpio_bus_deinit(struct device *dev) 
	kfree(bitbang);

}



static void __devexit mdio_gpio_bus_destroy(struct device *dev)

static void mdio_gpio_bus_destroy(struct device *dev)

{

	struct mii_bus *bus = dev_get_drvdata(dev);
@@ -181,7 +181,7 @@ static void __devexit mdio_gpio_bus_destroy(struct device *dev) 
	mdio_gpio_bus_deinit(dev);

}



static int __devinit mdio_gpio_probe(struct platform_device *pdev)

static int mdio_gpio_probe(struct platform_device *pdev)

{

	struct mdio_gpio_platform_data *pdata;

	struct mii_bus *new_bus;
@@ -213,7 +213,7 @@ static int __devinit mdio_gpio_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit mdio_gpio_remove(struct platform_device *pdev)

static int mdio_gpio_remove(struct platform_device *pdev)

{

	mdio_gpio_bus_destroy(&pdev->dev);
@@ -227,7 +227,7 @@ static struct of_device_id mdio_gpio_of_match[] = { 


static struct platform_driver mdio_gpio_driver = {

	.probe = mdio_gpio_probe,

	.remove = __devexit_p(mdio_gpio_remove),

	.remove = mdio_gpio_remove,

	.driver		= {

		.name	= "mdio-gpio",

		.owner	= THIS_MODULE,

drivers/net/phy/mdio-mux-gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int mdio_mux_gpio_switch_fn(int current_child, int desired_child, 
	return 0;

}



static int __devinit mdio_mux_gpio_probe(struct platform_device *pdev)

static int mdio_mux_gpio_probe(struct platform_device *pdev)

{

	enum of_gpio_flags f;

	struct mdio_mux_gpio_state *s;
@@ -104,7 +104,7 @@ static int __devinit mdio_mux_gpio_probe(struct platform_device *pdev) 
	return r;

}



static int __devexit mdio_mux_gpio_remove(struct platform_device *pdev)

static int mdio_mux_gpio_remove(struct platform_device *pdev)

{

	struct mdio_mux_gpio_state *s = pdev->dev.platform_data;

	mdio_mux_uninit(s->mux_handle);
@@ -130,7 +130,7 @@ static struct platform_driver mdio_mux_gpio_driver = { 
		.of_match_table = mdio_mux_gpio_match,

	},

	.probe		= mdio_mux_gpio_probe,

	.remove		= __devexit_p(mdio_mux_gpio_remove),

	.remove		= mdio_mux_gpio_remove,

};



module_platform_driver(mdio_mux_gpio_driver);

drivers/net/phy/mdio-mux-mmioreg.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int mdio_mux_mmioreg_switch_fn(int current_child, int desired_child, 
	return 0;

}



static int __devinit mdio_mux_mmioreg_probe(struct platform_device *pdev)

static int mdio_mux_mmioreg_probe(struct platform_device *pdev)

{

	struct device_node *np2, *np = pdev->dev.of_node;

	struct mdio_mux_mmioreg_state *s;
@@ -137,7 +137,7 @@ static int __devinit mdio_mux_mmioreg_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit mdio_mux_mmioreg_remove(struct platform_device *pdev)

static int mdio_mux_mmioreg_remove(struct platform_device *pdev)

{

	struct mdio_mux_mmioreg_state *s = dev_get_platdata(&pdev->dev);
@@ -161,7 +161,7 @@ static struct platform_driver mdio_mux_mmioreg_driver = { 
		.of_match_table = mdio_mux_mmioreg_match,

	},

	.probe		= mdio_mux_mmioreg_probe,

	.remove		= __devexit_p(mdio_mux_mmioreg_remove),

	.remove		= mdio_mux_mmioreg_remove,

};



module_platform_driver(mdio_mux_mmioreg_driver);

drivers/net/phy/mdio-octeon.c

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id, 
	return 0;

}



static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)

static int octeon_mdiobus_probe(struct platform_device *pdev)

{

	struct octeon_mdiobus *bus;

	struct resource *res_mem;
@@ -159,7 +159,7 @@ static int __devinit octeon_mdiobus_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit octeon_mdiobus_remove(struct platform_device *pdev)

static int octeon_mdiobus_remove(struct platform_device *pdev)

{

	struct octeon_mdiobus *bus;

	union cvmx_smix_en smi_en;
@@ -188,7 +188,7 @@ static struct platform_driver octeon_mdiobus_driver = { 
		.of_match_table = octeon_mdiobus_match,

	},

	.probe		= octeon_mdiobus_probe,

	.remove		= __devexit_p(octeon_mdiobus_remove),

	.remove		= octeon_mdiobus_remove,

};



void octeon_mdiobus_force_mod_depencency(void)

drivers/net/phy/spi_ks8995.c

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static struct bin_attribute ks8995_registers_attr = { 


/* ------------------------------------------------------------------------ */



static int __devinit ks8995_probe(struct spi_device *spi)

static int ks8995_probe(struct spi_device *spi)

{

	struct ks8995_switch    *ks;

	struct ks8995_pdata     *pdata;
@@ -332,7 +332,7 @@ static int __devinit ks8995_probe(struct spi_device *spi) 
	return err;

}



static int __devexit ks8995_remove(struct spi_device *spi)

static int ks8995_remove(struct spi_device *spi)

{

	struct ks8995_data      *ks8995;
@@ -353,7 +353,7 @@ static struct spi_driver ks8995_driver = { 
		.owner	   = THIS_MODULE,

	},

	.probe	  = ks8995_probe,

	.remove	  = __devexit_p(ks8995_remove),

	.remove	  = ks8995_remove,

};



static int __init ks8995_init(void)