Skip to content

L
linux
Commit fe17dc1e authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

ibm/emac: 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 e11787a2
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
drivers/net/ethernet/ibm/emac/core.c
View file @ fe17dc1e
...@@ -2261,7 +2261,7 @@ struct emac_depentry { ...@@ -2261,7 +2261,7 @@ struct emac_depentry {
#define EMAC_DEP_PREV_IDX 5 #define EMAC_DEP_PREV_IDX 5
#define EMAC_DEP_COUNT 6 #define EMAC_DEP_COUNT 6
static int __devinit emac_check_deps(struct emac_instance *dev, static int emac_check_deps(struct emac_instance *dev,
struct emac_depentry *deps) struct emac_depentry *deps)
{ {
int i, there = 0; int i, there = 0;
...@@ -2314,7 +2314,7 @@ static void emac_put_deps(struct emac_instance *dev) ...@@ -2314,7 +2314,7 @@ static void emac_put_deps(struct emac_instance *dev)
of_dev_put(dev->tah_dev); of_dev_put(dev->tah_dev);
} }
static int __devinit emac_of_bus_notify(struct notifier_block *nb, static int emac_of_bus_notify(struct notifier_block *nb,
unsigned long action, void *data) unsigned long action, void *data)
{ {
/* We are only intereted in device addition */ /* We are only intereted in device addition */
...@@ -2323,11 +2323,11 @@ static int __devinit emac_of_bus_notify(struct notifier_block *nb, ...@@ -2323,11 +2323,11 @@ static int __devinit emac_of_bus_notify(struct notifier_block *nb,
return 0; return 0;
} }
static struct notifier_block emac_of_bus_notifier __devinitdata = { static struct notifier_block emac_of_bus_notifier = {
.notifier_call = emac_of_bus_notify .notifier_call = emac_of_bus_notify
}; };
static int __devinit emac_wait_deps(struct emac_instance *dev) static int emac_wait_deps(struct emac_instance *dev)
{ {
struct emac_depentry deps[EMAC_DEP_COUNT]; struct emac_depentry deps[EMAC_DEP_COUNT];
int i, err; int i, err;
...@@ -2367,7 +2367,7 @@ static int __devinit emac_wait_deps(struct emac_instance *dev) ...@@ -2367,7 +2367,7 @@ static int __devinit emac_wait_deps(struct emac_instance *dev)
return err; return err;
} }
static int __devinit emac_read_uint_prop(struct device_node *np, const char *name, static int emac_read_uint_prop(struct device_node *np, const char *name,
u32 *val, int fatal) u32 *val, int fatal)
{ {
int len; int len;
...@@ -2382,7 +2382,7 @@ static int __devinit emac_read_uint_prop(struct device_node *np, const char *nam ...@@ -2382,7 +2382,7 @@ static int __devinit emac_read_uint_prop(struct device_node *np, const char *nam
return 0; return 0;
} }
static int __devinit emac_init_phy(struct emac_instance *dev) static int emac_init_phy(struct emac_instance *dev)
{ {
struct device_node *np = dev->ofdev->dev.of_node; struct device_node *np = dev->ofdev->dev.of_node;
struct net_device *ndev = dev->ndev; struct net_device *ndev = dev->ndev;
...@@ -2518,7 +2518,7 @@ static int __devinit emac_init_phy(struct emac_instance *dev) ...@@ -2518,7 +2518,7 @@ static int __devinit emac_init_phy(struct emac_instance *dev)
return 0; return 0;
} }
static int __devinit emac_init_config(struct emac_instance *dev) static int emac_init_config(struct emac_instance *dev)
{ {
struct device_node *np = dev->ofdev->dev.of_node; struct device_node *np = dev->ofdev->dev.of_node;
const void *p; const void *p;
...@@ -2703,7 +2703,7 @@ static const struct net_device_ops emac_gige_netdev_ops = { ...@@ -2703,7 +2703,7 @@ static const struct net_device_ops emac_gige_netdev_ops = {
.ndo_change_mtu = emac_change_mtu, .ndo_change_mtu = emac_change_mtu,
}; };
static int __devinit emac_probe(struct platform_device *ofdev) static int emac_probe(struct platform_device *ofdev)
{ {
struct net_device *ndev; struct net_device *ndev;
struct emac_instance *dev; struct emac_instance *dev;
...@@ -2930,7 +2930,7 @@ static int __devinit emac_probe(struct platform_device *ofdev) ...@@ -2930,7 +2930,7 @@ static int __devinit emac_probe(struct platform_device *ofdev)
return err; return err;
} }
static int __devexit emac_remove(struct platform_device *ofdev) static int emac_remove(struct platform_device *ofdev)
{ {
struct emac_instance *dev = dev_get_drvdata(&ofdev->dev); struct emac_instance *dev = dev_get_drvdata(&ofdev->dev);
......
drivers/net/ethernet/ibm/emac/mal.c
View file @ fe17dc1e
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
static int mal_count; static int mal_count;
int __devinit mal_register_commac(struct mal_instance *mal, int mal_register_commac(struct mal_instance *mal,
struct mal_commac *commac) struct mal_commac *commac)
{ {
unsigned long flags; unsigned long flags;
...@@ -517,7 +517,7 @@ void *mal_dump_regs(struct mal_instance *mal, void *buf) ...@@ -517,7 +517,7 @@ void *mal_dump_regs(struct mal_instance *mal, void *buf)
return regs + 1; return regs + 1;
} }
static int __devinit mal_probe(struct platform_device *ofdev) static int mal_probe(struct platform_device *ofdev)
{ {
struct mal_instance *mal; struct mal_instance *mal;
int err = 0, i, bd_size; int err = 0, i, bd_size;
...@@ -729,7 +729,7 @@ static int __devinit mal_probe(struct platform_device *ofdev) ...@@ -729,7 +729,7 @@ static int __devinit mal_probe(struct platform_device *ofdev)
return err; return err;
} }
static int __devexit mal_remove(struct platform_device *ofdev) static int mal_remove(struct platform_device *ofdev)
{ {
struct mal_instance *mal = dev_get_drvdata(&ofdev->dev); struct mal_instance *mal = dev_get_drvdata(&ofdev->dev);
......
drivers/net/ethernet/ibm/emac/rgmii.c
View file @ fe17dc1e
...@@ -93,7 +93,7 @@ static inline u32 rgmii_mode_mask(int mode, int input) ...@@ -93,7 +93,7 @@ static inline u32 rgmii_mode_mask(int mode, int input)
} }
} }
int __devinit rgmii_attach(struct platform_device *ofdev, int input, int mode) int rgmii_attach(struct platform_device *ofdev, int input, int mode)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct rgmii_regs __iomem *p = dev->base; struct rgmii_regs __iomem *p = dev->base;
...@@ -228,7 +228,7 @@ void *rgmii_dump_regs(struct platform_device *ofdev, void *buf) ...@@ -228,7 +228,7 @@ void *rgmii_dump_regs(struct platform_device *ofdev, void *buf)
} }
static int __devinit rgmii_probe(struct platform_device *ofdev) static int rgmii_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct rgmii_instance *dev; struct rgmii_instance *dev;
...@@ -289,7 +289,7 @@ static int __devinit rgmii_probe(struct platform_device *ofdev) ...@@ -289,7 +289,7 @@ static int __devinit rgmii_probe(struct platform_device *ofdev)
return rc; return rc;
} }
static int __devexit rgmii_remove(struct platform_device *ofdev) static int rgmii_remove(struct platform_device *ofdev)
{ {
struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct rgmii_instance *dev = dev_get_drvdata(&ofdev->dev);
......
drivers/net/ethernet/ibm/emac/tah.c
View file @ fe17dc1e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "emac.h" #include "emac.h"
#include "core.h" #include "core.h"
int __devinit tah_attach(struct platform_device *ofdev, int channel) int tah_attach(struct platform_device *ofdev, int channel)
{ {
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
...@@ -87,7 +87,7 @@ void *tah_dump_regs(struct platform_device *ofdev, void *buf) ...@@ -87,7 +87,7 @@ void *tah_dump_regs(struct platform_device *ofdev, void *buf)
return regs + 1; return regs + 1;
} }
static int __devinit tah_probe(struct platform_device *ofdev) static int tah_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct tah_instance *dev; struct tah_instance *dev;
...@@ -135,7 +135,7 @@ static int __devinit tah_probe(struct platform_device *ofdev) ...@@ -135,7 +135,7 @@ static int __devinit tah_probe(struct platform_device *ofdev)
return rc; return rc;
} }
static int __devexit tah_remove(struct platform_device *ofdev) static int tah_remove(struct platform_device *ofdev)
{ {
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
......
drivers/net/ethernet/ibm/emac/zmii.c
View file @ fe17dc1e
...@@ -82,7 +82,7 @@ static inline u32 zmii_mode_mask(int mode, int input) ...@@ -82,7 +82,7 @@ static inline u32 zmii_mode_mask(int mode, int input)
} }
} }
int __devinit zmii_attach(struct platform_device *ofdev, int input, int *mode) int zmii_attach(struct platform_device *ofdev, int input, int *mode)
{ {
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
struct zmii_regs __iomem *p = dev->base; struct zmii_regs __iomem *p = dev->base;
...@@ -231,7 +231,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf) ...@@ -231,7 +231,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
return regs + 1; return regs + 1;
} }
static int __devinit zmii_probe(struct platform_device *ofdev) static int zmii_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct zmii_instance *dev; struct zmii_instance *dev;
...@@ -282,7 +282,7 @@ static int __devinit zmii_probe(struct platform_device *ofdev) ...@@ -282,7 +282,7 @@ static int __devinit zmii_probe(struct platform_device *ofdev)
return rc; return rc;
} }
static int __devexit zmii_remove(struct platform_device *ofdev) static int zmii_remove(struct platform_device *ofdev)
{ {
struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7