diff options
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_main.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index c240e9972cb..cd8d290a09f 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c @@ -59,16 +59,16 @@ MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");  MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");  MODULE_VERSION(HCAD_VERSION); -static int ehca_open_aqp1     = 0; +static bool ehca_open_aqp1    = 0;  static int ehca_hw_level      = 0; -static int ehca_poll_all_eqs  = 1; +static bool ehca_poll_all_eqs = 1;  int ehca_debug_level   = 0;  int ehca_nr_ports      = -1; -int ehca_use_hp_mr     = 0; +bool ehca_use_hp_mr    = 0;  int ehca_port_act_time = 30;  int ehca_static_rate   = -1; -int ehca_scaling_code  = 0; +bool ehca_scaling_code = 0;  int ehca_lock_hcalls   = -1;  int ehca_max_cq        = -1;  int ehca_max_qp        = -1; @@ -82,7 +82,7 @@ module_param_named(port_act_time, ehca_port_act_time, int,  S_IRUGO);  module_param_named(poll_all_eqs,  ehca_poll_all_eqs,  bool, S_IRUGO);  module_param_named(static_rate,   ehca_static_rate,   int,  S_IRUGO);  module_param_named(scaling_code,  ehca_scaling_code,  bool, S_IRUGO); -module_param_named(lock_hcalls,   ehca_lock_hcalls,   bool, S_IRUGO); +module_param_named(lock_hcalls,   ehca_lock_hcalls,   bint, S_IRUGO);  module_param_named(number_of_cqs, ehca_max_cq,        int,  S_IRUGO);  module_param_named(number_of_qps, ehca_max_qp,        int,  S_IRUGO); @@ -211,6 +211,7 @@ static int ehca_create_slab_caches(void)  	if (!ctblk_cache) {  		ehca_gen_err("Cannot create ctblk SLAB cache.");  		ehca_cleanup_small_qp_cache(); +		ret = -ENOMEM;  		goto create_slab_caches6;  	}  #endif @@ -713,8 +714,7 @@ static struct attribute_group ehca_dev_attr_grp = {  	.attrs = ehca_dev_attrs  }; -static int __devinit ehca_probe(struct platform_device *dev, -				const struct of_device_id *id) +static int ehca_probe(struct platform_device *dev)  {  	struct ehca_shca *shca;  	const u64 *handle; @@ -879,7 +879,7 @@ probe1:  	return -EINVAL;  } -static int __devexit ehca_remove(struct platform_device *dev) +static int ehca_remove(struct platform_device *dev)  {  	struct ehca_shca *shca = dev_get_drvdata(&dev->dev);  	unsigned long flags; @@ -937,7 +937,7 @@ static struct of_device_id ehca_device_table[] =  };  MODULE_DEVICE_TABLE(of, ehca_device_table); -static struct of_platform_driver ehca_driver = { +static struct platform_driver ehca_driver = {  	.probe       = ehca_probe,  	.remove      = ehca_remove,  	.driver = {  | 
