mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
net/apple: 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>
This commit is contained in:
parent
0cb0568dfe
commit
97c71ad4ce
3 changed files with 7 additions and 7 deletions
|
@ -1244,7 +1244,7 @@ static const struct net_device_ops bmac_netdev_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
|
||||
static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
|
||||
{
|
||||
int j, rev, ret;
|
||||
struct bmac_data *bp;
|
||||
|
@ -1602,7 +1602,7 @@ bmac_proc_info(char *buffer, char **start, off_t offset, int length)
|
|||
}
|
||||
#endif
|
||||
|
||||
static int __devexit bmac_remove(struct macio_dev *mdev)
|
||||
static int bmac_remove(struct macio_dev *mdev)
|
||||
{
|
||||
struct net_device *dev = macio_get_drvdata(mdev);
|
||||
struct bmac_data *bp = netdev_priv(dev);
|
||||
|
|
|
@ -106,7 +106,7 @@ static const struct net_device_ops mace_netdev_ops = {
|
|||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_id *match)
|
||||
static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *mace = macio_get_of_node(mdev);
|
||||
struct net_device *dev;
|
||||
|
@ -271,7 +271,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit mace_remove(struct macio_dev *mdev)
|
||||
static int mace_remove(struct macio_dev *mdev)
|
||||
{
|
||||
struct net_device *dev = macio_get_drvdata(mdev);
|
||||
struct mace_data *mp;
|
||||
|
|
|
@ -195,7 +195,7 @@ static const struct net_device_ops mace_netdev_ops = {
|
|||
* model of Macintrash has a MACE (AV macintoshes)
|
||||
*/
|
||||
|
||||
static int __devinit mace_probe(struct platform_device *pdev)
|
||||
static int mace_probe(struct platform_device *pdev)
|
||||
{
|
||||
int j;
|
||||
struct mace_data *mp;
|
||||
|
@ -746,7 +746,7 @@ MODULE_LICENSE("GPL");
|
|||
MODULE_DESCRIPTION("Macintosh MACE ethernet driver");
|
||||
MODULE_ALIAS("platform:macmace");
|
||||
|
||||
static int __devexit mac_mace_device_remove (struct platform_device *pdev)
|
||||
static int mac_mace_device_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct mace_data *mp = netdev_priv(dev);
|
||||
|
@ -768,7 +768,7 @@ static int __devexit mac_mace_device_remove (struct platform_device *pdev)
|
|||
|
||||
static struct platform_driver mac_mace_driver = {
|
||||
.probe = mace_probe,
|
||||
.remove = __devexit_p(mac_mace_device_remove),
|
||||
.remove = mac_mace_device_remove,
|
||||
.driver = {
|
||||
.name = mac_mace_string,
|
||||
.owner = THIS_MODULE,
|
||||
|
|
Loading…
Reference in a new issue