diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:24:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:55 -0500 |
commit | f73d12bd298f9614d8600326e9bd1f7871fcde4b (patch) | |
tree | 736c67ac825f2576b6d3a703defd1859e13787eb /drivers/net/ethernet/sun/sunhme.c | |
parent | f48a3c2af87960e3d497b518a3253337a18016db (diff) |
net/sun: 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>
Diffstat (limited to 'drivers/net/ethernet/sun/sunhme.c')
-rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 73f341b8befb..43babc33a2c9 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c | |||
@@ -2499,7 +2499,7 @@ static int hme_version_printed; | |||
2499 | * | 2499 | * |
2500 | * Return NULL on failure. | 2500 | * Return NULL on failure. |
2501 | */ | 2501 | */ |
2502 | static struct quattro * __devinit quattro_sbus_find(struct platform_device *child) | 2502 | static struct quattro *quattro_sbus_find(struct platform_device *child) |
2503 | { | 2503 | { |
2504 | struct device *parent = child->dev.parent; | 2504 | struct device *parent = child->dev.parent; |
2505 | struct platform_device *op; | 2505 | struct platform_device *op; |
@@ -2580,7 +2580,7 @@ static void quattro_sbus_free_irqs(void) | |||
2580 | #endif /* CONFIG_SBUS */ | 2580 | #endif /* CONFIG_SBUS */ |
2581 | 2581 | ||
2582 | #ifdef CONFIG_PCI | 2582 | #ifdef CONFIG_PCI |
2583 | static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev) | 2583 | static struct quattro *quattro_pci_find(struct pci_dev *pdev) |
2584 | { | 2584 | { |
2585 | struct pci_dev *bdev = pdev->bus->self; | 2585 | struct pci_dev *bdev = pdev->bus->self; |
2586 | struct quattro *qp; | 2586 | struct quattro *qp; |
@@ -2623,7 +2623,7 @@ static const struct net_device_ops hme_netdev_ops = { | |||
2623 | }; | 2623 | }; |
2624 | 2624 | ||
2625 | #ifdef CONFIG_SBUS | 2625 | #ifdef CONFIG_SBUS |
2626 | static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe) | 2626 | static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe) |
2627 | { | 2627 | { |
2628 | struct device_node *dp = op->dev.of_node, *sbus_dp; | 2628 | struct device_node *dp = op->dev.of_node, *sbus_dp; |
2629 | struct quattro *qp = NULL; | 2629 | struct quattro *qp = NULL; |
@@ -2927,7 +2927,7 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr) | |||
2927 | } | 2927 | } |
2928 | #endif /* !(CONFIG_SPARC) */ | 2928 | #endif /* !(CONFIG_SPARC) */ |
2929 | 2929 | ||
2930 | static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | 2930 | static int happy_meal_pci_probe(struct pci_dev *pdev, |
2931 | const struct pci_device_id *ent) | 2931 | const struct pci_device_id *ent) |
2932 | { | 2932 | { |
2933 | struct quattro *qp = NULL; | 2933 | struct quattro *qp = NULL; |
@@ -3162,7 +3162,7 @@ err_out: | |||
3162 | return err; | 3162 | return err; |
3163 | } | 3163 | } |
3164 | 3164 | ||
3165 | static void __devexit happy_meal_pci_remove(struct pci_dev *pdev) | 3165 | static void happy_meal_pci_remove(struct pci_dev *pdev) |
3166 | { | 3166 | { |
3167 | struct happy_meal *hp = dev_get_drvdata(&pdev->dev); | 3167 | struct happy_meal *hp = dev_get_drvdata(&pdev->dev); |
3168 | struct net_device *net_dev = hp->dev; | 3168 | struct net_device *net_dev = hp->dev; |
@@ -3190,7 +3190,7 @@ static struct pci_driver hme_pci_driver = { | |||
3190 | .name = "hme", | 3190 | .name = "hme", |
3191 | .id_table = happymeal_pci_ids, | 3191 | .id_table = happymeal_pci_ids, |
3192 | .probe = happy_meal_pci_probe, | 3192 | .probe = happy_meal_pci_probe, |
3193 | .remove = __devexit_p(happy_meal_pci_remove), | 3193 | .remove = happy_meal_pci_remove, |
3194 | }; | 3194 | }; |
3195 | 3195 | ||
3196 | static int __init happy_meal_pci_init(void) | 3196 | static int __init happy_meal_pci_init(void) |
@@ -3216,7 +3216,7 @@ static void happy_meal_pci_exit(void) | |||
3216 | 3216 | ||
3217 | #ifdef CONFIG_SBUS | 3217 | #ifdef CONFIG_SBUS |
3218 | static const struct of_device_id hme_sbus_match[]; | 3218 | static const struct of_device_id hme_sbus_match[]; |
3219 | static int __devinit hme_sbus_probe(struct platform_device *op) | 3219 | static int hme_sbus_probe(struct platform_device *op) |
3220 | { | 3220 | { |
3221 | const struct of_device_id *match; | 3221 | const struct of_device_id *match; |
3222 | struct device_node *dp = op->dev.of_node; | 3222 | struct device_node *dp = op->dev.of_node; |
@@ -3234,7 +3234,7 @@ static int __devinit hme_sbus_probe(struct platform_device *op) | |||
3234 | return happy_meal_sbus_probe_one(op, is_qfe); | 3234 | return happy_meal_sbus_probe_one(op, is_qfe); |
3235 | } | 3235 | } |
3236 | 3236 | ||
3237 | static int __devexit hme_sbus_remove(struct platform_device *op) | 3237 | static int hme_sbus_remove(struct platform_device *op) |
3238 | { | 3238 | { |
3239 | struct happy_meal *hp = dev_get_drvdata(&op->dev); | 3239 | struct happy_meal *hp = dev_get_drvdata(&op->dev); |
3240 | struct net_device *net_dev = hp->dev; | 3240 | struct net_device *net_dev = hp->dev; |
@@ -3284,7 +3284,7 @@ static struct platform_driver hme_sbus_driver = { | |||
3284 | .of_match_table = hme_sbus_match, | 3284 | .of_match_table = hme_sbus_match, |
3285 | }, | 3285 | }, |
3286 | .probe = hme_sbus_probe, | 3286 | .probe = hme_sbus_probe, |
3287 | .remove = __devexit_p(hme_sbus_remove), | 3287 | .remove = hme_sbus_remove, |
3288 | }; | 3288 | }; |
3289 | 3289 | ||
3290 | static int __init happy_meal_sbus_init(void) | 3290 | static int __init happy_meal_sbus_init(void) |