Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 286176
b: refs/heads/master
c: 1886e5d
h: refs/heads/master
v: v3
  • Loading branch information
Thadeu Lima de Souza Cascardo authored and David S. Miller committed Jan 17, 2012
1 parent 9ae0370 commit cc74c94
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: be94db9ddac0d6ea76f479b04fb3a43314654c9f
refs/heads/master: 1886e5d2c694e7fb59434c717e704e7fd8475d2e
2 changes: 1 addition & 1 deletion trunk/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
data[i++] = atomic_read(&port->port_res[k].swqe_avail);
}

const struct ethtool_ops ehea_ethtool_ops = {
static const struct ethtool_ops ehea_ethtool_ops = {
.get_settings = ehea_get_settings,
.get_drvinfo = ehea_get_drvinfo,
.get_msglevel = ehea_get_msglevel,
Expand Down
32 changes: 16 additions & 16 deletions trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ static int port_name_cnt;
static LIST_HEAD(adapter_list);
static unsigned long ehea_driver_flags;
static DEFINE_MUTEX(dlpar_mem_lock);
struct ehea_fw_handle_array ehea_fw_handles;
struct ehea_bcmc_reg_array ehea_bcmc_regs;
static struct ehea_fw_handle_array ehea_fw_handles;
static struct ehea_bcmc_reg_array ehea_bcmc_regs;


static int __devinit ehea_probe_adapter(struct platform_device *dev,
Expand Down Expand Up @@ -133,7 +133,7 @@ void ehea_dump(void *adr, int len, char *msg)
}
}

void ehea_schedule_port_reset(struct ehea_port *port)
static void ehea_schedule_port_reset(struct ehea_port *port)
{
if (!test_bit(__EHEA_DISABLE_PORT_RESET, &port->flags))
schedule_work(&port->reset_task);
Expand Down Expand Up @@ -1404,7 +1404,7 @@ static int ehea_configure_port(struct ehea_port *port)
return ret;
}

int ehea_gen_smrs(struct ehea_port_res *pr)
static int ehea_gen_smrs(struct ehea_port_res *pr)
{
int ret;
struct ehea_adapter *adapter = pr->port->adapter;
Expand All @@ -1426,7 +1426,7 @@ int ehea_gen_smrs(struct ehea_port_res *pr)
return -EIO;
}

int ehea_rem_smrs(struct ehea_port_res *pr)
static int ehea_rem_smrs(struct ehea_port_res *pr)
{
if ((ehea_rem_mr(&pr->send_mr)) ||
(ehea_rem_mr(&pr->recv_mr)))
Expand Down Expand Up @@ -2190,7 +2190,7 @@ static int ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
return err;
}

int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
static int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
{
int ret = -EIO;
u64 hret;
Expand Down Expand Up @@ -2531,7 +2531,7 @@ static void ehea_flush_sq(struct ehea_port *port)
}
}

int ehea_stop_qps(struct net_device *dev)
static int ehea_stop_qps(struct net_device *dev)
{
struct ehea_port *port = netdev_priv(dev);
struct ehea_adapter *adapter = port->adapter;
Expand Down Expand Up @@ -2600,7 +2600,7 @@ int ehea_stop_qps(struct net_device *dev)
return ret;
}

void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
static void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
{
struct ehea_qp qp = *orig_qp;
struct ehea_qp_init_attr *init_attr = &qp.init_attr;
Expand Down Expand Up @@ -2633,7 +2633,7 @@ void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
}
}

int ehea_restart_qps(struct net_device *dev)
static int ehea_restart_qps(struct net_device *dev)
{
struct ehea_port *port = netdev_priv(dev);
struct ehea_adapter *adapter = port->adapter;
Expand Down Expand Up @@ -2824,7 +2824,7 @@ static void ehea_tx_watchdog(struct net_device *dev)
ehea_schedule_port_reset(port);
}

int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
static int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
{
struct hcp_query_ehea *cb;
u64 hret;
Expand Down Expand Up @@ -2852,7 +2852,7 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
return ret;
}

int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
static int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
{
struct hcp_ehea_port_cb4 *cb4;
u64 hret;
Expand Down Expand Up @@ -2966,7 +2966,7 @@ static const struct net_device_ops ehea_netdev_ops = {
.ndo_tx_timeout = ehea_tx_watchdog,
};

struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
u32 logical_port_id,
struct device_node *dn)
{
Expand Down Expand Up @@ -3237,7 +3237,7 @@ static ssize_t ehea_remove_port(struct device *dev,
static DEVICE_ATTR(probe_port, S_IWUSR, NULL, ehea_probe_port);
static DEVICE_ATTR(remove_port, S_IWUSR, NULL, ehea_remove_port);

int ehea_create_device_sysfs(struct platform_device *dev)
static int ehea_create_device_sysfs(struct platform_device *dev)
{
int ret = device_create_file(&dev->dev, &dev_attr_probe_port);
if (ret)
Expand All @@ -3248,7 +3248,7 @@ int ehea_create_device_sysfs(struct platform_device *dev)
return ret;
}

void ehea_remove_device_sysfs(struct platform_device *dev)
static void ehea_remove_device_sysfs(struct platform_device *dev)
{
device_remove_file(&dev->dev, &dev_attr_probe_port);
device_remove_file(&dev->dev, &dev_attr_remove_port);
Expand Down Expand Up @@ -3379,7 +3379,7 @@ static int __devexit ehea_remove(struct platform_device *dev)
return 0;
}

void ehea_crash_handler(void)
static void ehea_crash_handler(void)
{
int i;

Expand Down Expand Up @@ -3491,7 +3491,7 @@ static ssize_t ehea_show_capabilities(struct device_driver *drv,
static DRIVER_ATTR(capabilities, S_IRUSR | S_IRGRP | S_IROTH,
ehea_show_capabilities, NULL);

int __init ehea_module_init(void)
static int __init ehea_module_init(void)
{
int ret;

Expand Down
14 changes: 6 additions & 8 deletions trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
#include "ehea_phyp.h"
#include "ehea_qmr.h"

struct ehea_bmap *ehea_bmap = NULL;


static struct ehea_bmap *ehea_bmap;

static void *hw_qpageit_get_inc(struct hw_queue *queue)
{
Expand Down Expand Up @@ -212,7 +210,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
return NULL;
}

u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
static u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
{
u64 hret;
u64 adapter_handle = cq->adapter->handle;
Expand Down Expand Up @@ -337,7 +335,7 @@ struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq)
return eqe;
}

u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
static u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
{
u64 hret;
unsigned long flags;
Expand Down Expand Up @@ -381,7 +379,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)
/**
* allocates memory for a queue and registers pages in phyp
*/
int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
int nr_pages, int wqe_size, int act_nr_sges,
struct ehea_adapter *adapter, int h_call_q_selector)
{
Expand Down Expand Up @@ -516,7 +514,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
return NULL;
}

u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
static u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
{
u64 hret;
struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
Expand Down Expand Up @@ -976,7 +974,7 @@ int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
return 0;
}

void print_error_data(u64 *data)
static void print_error_data(u64 *data)
{
int length;
u64 type = EHEA_BMASK_GET(ERROR_DATA_TYPE, data[2]);
Expand Down

0 comments on commit cc74c94

Please sign in to comment.