Skip to content

Commit

Permalink
staging: octeon: remove use of __devinit
Browse files Browse the repository at this point in the history
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent df1f35e commit 4f24090
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/octeon/ethernet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

static __devinit void cvm_oct_configure_common_hw(void)
static void cvm_oct_configure_common_hw(void)
{
/* Setup the FPA */
cvmx_fpa_enable();
Expand Down Expand Up @@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = {

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)
{
struct device_node *node = NULL;
Expand All @@ -604,7 +604,7 @@ static struct device_node * __devinit cvm_oct_of_get_child(const struct device_n
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)
{
struct device_node *ni, *np;
Expand All @@ -619,7 +619,7 @@ static struct device_node * __devinit cvm_oct_node_for_port(struct device_node *
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 interface;
Expand Down

0 comments on commit 4f24090

Please sign in to comment.