Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull ipmi driver bugfixes from Corey Minyard:
"Fix two bugs:
One that lockdep turned up, I didn't go far enough with cleanup of
attributes for IPMI. This has been there a long time; my previous fix
of this didn't fix all the attributes.
One fix for some arches that need an explicit linux/ctype.h for
isspace()"
* tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
ipmi: Fix compile issue with isspace()
ipmi: Finish cleanup of BMC attributes
+18
-29
+17
-29
drivers/char/ipmi/ipmi_msghandler.c
+17
-29
drivers/char/ipmi/ipmi_msghandler.c
···
199
199
int guid_set;
200
200
char name[16];
201
201
struct kref usecount;
202
-
203
-
/* bmc device attributes */
204
-
struct device_attribute device_id_attr;
205
-
struct device_attribute provides_dev_sdrs_attr;
206
-
struct device_attribute revision_attr;
207
-
struct device_attribute firmware_rev_attr;
208
-
struct device_attribute version_attr;
209
-
struct device_attribute add_dev_support_attr;
210
-
struct device_attribute manufacturer_id_attr;
211
-
struct device_attribute product_id_attr;
212
-
struct device_attribute guid_attr;
213
-
struct device_attribute aux_firmware_rev_attr;
214
202
};
215
203
#define to_bmc_device(x) container_of((x), struct bmc_device, pdev.dev)
216
204
···
2240
2252
2241
2253
return snprintf(buf, 10, "%u\n", bmc->id.device_id);
2242
2254
}
2243
-
DEVICE_ATTR(device_id, S_IRUGO, device_id_show, NULL);
2255
+
static DEVICE_ATTR(device_id, S_IRUGO, device_id_show, NULL);
2244
2256
2245
2257
static ssize_t provides_device_sdrs_show(struct device *dev,
2246
2258
struct device_attribute *attr,
···
2251
2263
return snprintf(buf, 10, "%u\n",
2252
2264
(bmc->id.device_revision & 0x80) >> 7);
2253
2265
}
2254
-
DEVICE_ATTR(provides_device_sdrs, S_IRUGO, provides_device_sdrs_show, NULL);
2266
+
static DEVICE_ATTR(provides_device_sdrs, S_IRUGO, provides_device_sdrs_show,
2267
+
NULL);
2255
2268
2256
2269
static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
2257
2270
char *buf)
···
2262
2273
return snprintf(buf, 20, "%u\n",
2263
2274
bmc->id.device_revision & 0x0F);
2264
2275
}
2265
-
DEVICE_ATTR(revision, S_IRUGO, revision_show, NULL);
2276
+
static DEVICE_ATTR(revision, S_IRUGO, revision_show, NULL);
2266
2277
2267
2278
static ssize_t firmware_revision_show(struct device *dev,
2268
2279
struct device_attribute *attr,
···
2273
2284
return snprintf(buf, 20, "%u.%x\n", bmc->id.firmware_revision_1,
2274
2285
bmc->id.firmware_revision_2);
2275
2286
}
2276
-
DEVICE_ATTR(firmware_revision, S_IRUGO, firmware_revision_show, NULL);
2287
+
static DEVICE_ATTR(firmware_revision, S_IRUGO, firmware_revision_show, NULL);
2277
2288
2278
2289
static ssize_t ipmi_version_show(struct device *dev,
2279
2290
struct device_attribute *attr,
···
2285
2296
ipmi_version_major(&bmc->id),
2286
2297
ipmi_version_minor(&bmc->id));
2287
2298
}
2288
-
DEVICE_ATTR(ipmi_version, S_IRUGO, ipmi_version_show, NULL);
2299
+
static DEVICE_ATTR(ipmi_version, S_IRUGO, ipmi_version_show, NULL);
2289
2300
2290
2301
static ssize_t add_dev_support_show(struct device *dev,
2291
2302
struct device_attribute *attr,
···
2296
2307
return snprintf(buf, 10, "0x%02x\n",
2297
2308
bmc->id.additional_device_support);
2298
2309
}
2299
-
DEVICE_ATTR(additional_device_support, S_IRUGO, add_dev_support_show, NULL);
2310
+
static DEVICE_ATTR(additional_device_support, S_IRUGO, add_dev_support_show,
2311
+
NULL);
2300
2312
2301
2313
static ssize_t manufacturer_id_show(struct device *dev,
2302
2314
struct device_attribute *attr,
···
2307
2317
2308
2318
return snprintf(buf, 20, "0x%6.6x\n", bmc->id.manufacturer_id);
2309
2319
}
2310
-
DEVICE_ATTR(manufacturer_id, S_IRUGO, manufacturer_id_show, NULL);
2320
+
static DEVICE_ATTR(manufacturer_id, S_IRUGO, manufacturer_id_show, NULL);
2311
2321
2312
2322
static ssize_t product_id_show(struct device *dev,
2313
2323
struct device_attribute *attr,
···
2317
2327
2318
2328
return snprintf(buf, 10, "0x%4.4x\n", bmc->id.product_id);
2319
2329
}
2320
-
DEVICE_ATTR(product_id, S_IRUGO, product_id_show, NULL);
2330
+
static DEVICE_ATTR(product_id, S_IRUGO, product_id_show, NULL);
2321
2331
2322
2332
static ssize_t aux_firmware_rev_show(struct device *dev,
2323
2333
struct device_attribute *attr,
···
2331
2341
bmc->id.aux_firmware_revision[1],
2332
2342
bmc->id.aux_firmware_revision[0]);
2333
2343
}
2334
-
DEVICE_ATTR(aux_firmware_revision, S_IRUGO, aux_firmware_rev_show, NULL);
2344
+
static DEVICE_ATTR(aux_firmware_revision, S_IRUGO, aux_firmware_rev_show, NULL);
2335
2345
2336
2346
static ssize_t guid_show(struct device *dev, struct device_attribute *attr,
2337
2347
char *buf)
···
2342
2352
(long long) bmc->guid[0],
2343
2353
(long long) bmc->guid[8]);
2344
2354
}
2345
-
DEVICE_ATTR(guid, S_IRUGO, guid_show, NULL);
2355
+
static DEVICE_ATTR(guid, S_IRUGO, guid_show, NULL);
2346
2356
2347
2357
static struct attribute *bmc_dev_attrs[] = {
2348
2358
&dev_attr_device_id.attr,
···
2382
2392
2383
2393
if (bmc->id.aux_firmware_revision_set)
2384
2394
device_remove_file(&bmc->pdev.dev,
2385
-
&bmc->aux_firmware_rev_attr);
2395
+
&dev_attr_aux_firmware_revision);
2386
2396
if (bmc->guid_set)
2387
2397
device_remove_file(&bmc->pdev.dev,
2388
-
&bmc->guid_attr);
2398
+
&dev_attr_guid);
2389
2399
2390
2400
platform_device_unregister(&bmc->pdev);
2391
2401
}
···
2412
2422
int err;
2413
2423
2414
2424
if (bmc->id.aux_firmware_revision_set) {
2415
-
bmc->aux_firmware_rev_attr.attr.name = "aux_firmware_revision";
2416
2425
err = device_create_file(&bmc->pdev.dev,
2417
-
&bmc->aux_firmware_rev_attr);
2426
+
&dev_attr_aux_firmware_revision);
2418
2427
if (err)
2419
2428
goto out;
2420
2429
}
2421
2430
if (bmc->guid_set) {
2422
-
bmc->guid_attr.attr.name = "guid";
2423
2431
err = device_create_file(&bmc->pdev.dev,
2424
-
&bmc->guid_attr);
2432
+
&dev_attr_guid);
2425
2433
if (err)
2426
2434
goto out_aux_firm;
2427
2435
}
···
2429
2441
out_aux_firm:
2430
2442
if (bmc->id.aux_firmware_revision_set)
2431
2443
device_remove_file(&bmc->pdev.dev,
2432
-
&bmc->aux_firmware_rev_attr);
2444
+
&dev_attr_aux_firmware_revision);
2433
2445
out:
2434
2446
return err;
2435
2447
}