aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_kernel.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index ca4d0acc6786..367f2a38744e 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -234,12 +234,12 @@ struct ipath_devdata *ipath_lookup(int unit)
234 return dd; 234 return dd;
235} 235}
236 236
237int ipath_count_units(int *npresentp, int *nupp, u32 *maxportsp) 237int ipath_count_units(int *npresentp, int *nupp, int *maxportsp)
238{ 238{
239 int nunits, npresent, nup; 239 int nunits, npresent, nup;
240 struct ipath_devdata *dd; 240 struct ipath_devdata *dd;
241 unsigned long flags; 241 unsigned long flags;
242 u32 maxports; 242 int maxports;
243 243
244 nunits = npresent = nup = maxports = 0; 244 nunits = npresent = nup = maxports = 0;
245 245
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index ecf3f7ff7717..3d4a254ffca0 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -718,7 +718,7 @@ extern struct ipath_devdata *ipath_lookup(int unit);
718int ipath_init_chip(struct ipath_devdata *, int); 718int ipath_init_chip(struct ipath_devdata *, int);
719int ipath_enable_wc(struct ipath_devdata *dd); 719int ipath_enable_wc(struct ipath_devdata *dd);
720void ipath_disable_wc(struct ipath_devdata *dd); 720void ipath_disable_wc(struct ipath_devdata *dd);
721int ipath_count_units(int *npresentp, int *nupp, u32 *maxportsp); 721int ipath_count_units(int *npresentp, int *nupp, int *maxportsp);
722void ipath_shutdown_device(struct ipath_devdata *); 722void ipath_shutdown_device(struct ipath_devdata *);
723void ipath_clear_freeze(struct ipath_devdata *); 723void ipath_clear_freeze(struct ipath_devdata *);
724 724