Commit 4f240906 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

staging: octeon: remove use of __devinit

CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df1f35eb
...@@ -169,7 +169,7 @@ static void cvm_oct_periodic_worker(struct work_struct *work) ...@@ -169,7 +169,7 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ); queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ);
} }
static __devinit void cvm_oct_configure_common_hw(void) static void cvm_oct_configure_common_hw(void)
{ {
/* Setup the FPA */ /* Setup the FPA */
cvmx_fpa_enable(); cvmx_fpa_enable();
...@@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = { ...@@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = {
extern void octeon_mdiobus_force_mod_depencency(void); extern void octeon_mdiobus_force_mod_depencency(void);
static struct device_node * __devinit cvm_oct_of_get_child(const struct device_node *parent, static struct device_node *cvm_oct_of_get_child(const struct device_node *parent,
int reg_val) int reg_val)
{ {
struct device_node *node = NULL; struct device_node *node = NULL;
...@@ -604,7 +604,7 @@ static struct device_node * __devinit cvm_oct_of_get_child(const struct device_n ...@@ -604,7 +604,7 @@ static struct device_node * __devinit cvm_oct_of_get_child(const struct device_n
return node; return node;
} }
static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *pip, static struct device_node *cvm_oct_node_for_port(struct device_node *pip,
int interface, int port) int interface, int port)
{ {
struct device_node *ni, *np; struct device_node *ni, *np;
...@@ -619,7 +619,7 @@ static struct device_node * __devinit cvm_oct_node_for_port(struct device_node * ...@@ -619,7 +619,7 @@ static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *
return np; return np;
} }
static int __devinit cvm_oct_probe(struct platform_device *pdev) static int cvm_oct_probe(struct platform_device *pdev)
{ {
int num_interfaces; int num_interfaces;
int interface; int interface;
......
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