diff options
author | Bryan O'Sullivan <bos@pathscale.com> | 2006-07-01 07:36:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 12:56:01 -0400 |
commit | 1eb68b990aab4c007e520acae39c74d8116693bc (patch) | |
tree | 9e11f750a252879c22636048f68503b622cf2fbc /drivers/infiniband/hw/ipath/ipath_sysfs.c | |
parent | 12eef41f8b72b6e11e36b48c78849c17e49781c8 (diff) |
[PATCH] IB/ipath: purge sps_lid and sps_mlid arrays
The two arrays only had space for 4 units.
Also changed from ipath_set_sps_lid() to ipath_set_lid(); the sps was
leftover.
Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_sysfs.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_sysfs.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c index ccff629278a..59694f1ef3a 100644 --- a/drivers/infiniband/hw/ipath/ipath_sysfs.c +++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c | |||
@@ -115,11 +115,6 @@ DRIVER_STAT(pkey0, pkeys[0]); | |||
115 | DRIVER_STAT(pkey1, pkeys[1]); | 115 | DRIVER_STAT(pkey1, pkeys[1]); |
116 | DRIVER_STAT(pkey2, pkeys[2]); | 116 | DRIVER_STAT(pkey2, pkeys[2]); |
117 | DRIVER_STAT(pkey3, pkeys[3]); | 117 | DRIVER_STAT(pkey3, pkeys[3]); |
118 | /* XXX fix the following when dynamic table of devices used */ | ||
119 | DRIVER_STAT(lid0, lid[0]); | ||
120 | DRIVER_STAT(lid1, lid[1]); | ||
121 | DRIVER_STAT(lid2, lid[2]); | ||
122 | DRIVER_STAT(lid3, lid[3]); | ||
123 | 118 | ||
124 | DRIVER_STAT(nports, nports); | 119 | DRIVER_STAT(nports, nports); |
125 | DRIVER_STAT(null_intr, nullintr); | 120 | DRIVER_STAT(null_intr, nullintr); |
@@ -128,11 +123,6 @@ DRIVER_STAT(avg_pkts_call, avgpkts_call); | |||
128 | DRIVER_STAT(page_locks, pagelocks); | 123 | DRIVER_STAT(page_locks, pagelocks); |
129 | DRIVER_STAT(page_unlocks, pageunlocks); | 124 | DRIVER_STAT(page_unlocks, pageunlocks); |
130 | DRIVER_STAT(krdrops, krdrops); | 125 | DRIVER_STAT(krdrops, krdrops); |
131 | /* XXX fix the following when dynamic table of devices used */ | ||
132 | DRIVER_STAT(mlid0, mlid[0]); | ||
133 | DRIVER_STAT(mlid1, mlid[1]); | ||
134 | DRIVER_STAT(mlid2, mlid[2]); | ||
135 | DRIVER_STAT(mlid3, mlid[3]); | ||
136 | 126 | ||
137 | static struct attribute *driver_stat_attributes[] = { | 127 | static struct attribute *driver_stat_attributes[] = { |
138 | &driver_attr_intrs.attr, | 128 | &driver_attr_intrs.attr, |
@@ -155,10 +145,6 @@ static struct attribute *driver_stat_attributes[] = { | |||
155 | &driver_attr_pkey1.attr, | 145 | &driver_attr_pkey1.attr, |
156 | &driver_attr_pkey2.attr, | 146 | &driver_attr_pkey2.attr, |
157 | &driver_attr_pkey3.attr, | 147 | &driver_attr_pkey3.attr, |
158 | &driver_attr_lid0.attr, | ||
159 | &driver_attr_lid1.attr, | ||
160 | &driver_attr_lid2.attr, | ||
161 | &driver_attr_lid3.attr, | ||
162 | &driver_attr_nports.attr, | 148 | &driver_attr_nports.attr, |
163 | &driver_attr_null_intr.attr, | 149 | &driver_attr_null_intr.attr, |
164 | &driver_attr_max_pkts_call.attr, | 150 | &driver_attr_max_pkts_call.attr, |
@@ -166,10 +152,6 @@ static struct attribute *driver_stat_attributes[] = { | |||
166 | &driver_attr_page_locks.attr, | 152 | &driver_attr_page_locks.attr, |
167 | &driver_attr_page_unlocks.attr, | 153 | &driver_attr_page_unlocks.attr, |
168 | &driver_attr_krdrops.attr, | 154 | &driver_attr_krdrops.attr, |
169 | &driver_attr_mlid0.attr, | ||
170 | &driver_attr_mlid1.attr, | ||
171 | &driver_attr_mlid2.attr, | ||
172 | &driver_attr_mlid3.attr, | ||
173 | NULL | 155 | NULL |
174 | }; | 156 | }; |
175 | 157 | ||
@@ -273,7 +255,7 @@ static ssize_t store_lid(struct device *dev, | |||
273 | size_t count) | 255 | size_t count) |
274 | { | 256 | { |
275 | struct ipath_devdata *dd = dev_get_drvdata(dev); | 257 | struct ipath_devdata *dd = dev_get_drvdata(dev); |
276 | u16 lid; | 258 | u16 lid = 0; |
277 | int ret; | 259 | int ret; |
278 | 260 | ||
279 | ret = ipath_parse_ushort(buf, &lid); | 261 | ret = ipath_parse_ushort(buf, &lid); |
@@ -285,11 +267,11 @@ static ssize_t store_lid(struct device *dev, | |||
285 | goto invalid; | 267 | goto invalid; |
286 | } | 268 | } |
287 | 269 | ||
288 | ipath_set_sps_lid(dd, lid, 0); | 270 | ipath_set_lid(dd, lid, 0); |
289 | 271 | ||
290 | goto bail; | 272 | goto bail; |
291 | invalid: | 273 | invalid: |
292 | ipath_dev_err(dd, "attempt to set invalid LID\n"); | 274 | ipath_dev_err(dd, "attempt to set invalid LID 0x%x\n", lid); |
293 | bail: | 275 | bail: |
294 | return ret; | 276 | return ret; |
295 | } | 277 | } |
@@ -320,7 +302,6 @@ static ssize_t store_mlid(struct device *dev, | |||
320 | unit = dd->ipath_unit; | 302 | unit = dd->ipath_unit; |
321 | 303 | ||
322 | dd->ipath_mlid = mlid; | 304 | dd->ipath_mlid = mlid; |
323 | ipath_stats.sps_mlid[unit] = mlid; | ||
324 | ipath_layer_intr(dd, IPATH_LAYER_INT_BCAST); | 305 | ipath_layer_intr(dd, IPATH_LAYER_INT_BCAST); |
325 | 306 | ||
326 | goto bail; | 307 | goto bail; |