Skip to content

Commit a085a5e

Browse files
djbwweiny2
authored andcommitted
acpi/nfit: Use sysfs_emit() for all attributes
sysfs_emit() properly handles the PAGE_SIZE limitation of populating sysfs attribute buffers. Clean up the deprecated usage of sprintf() in all of nfit's sysfs show() handlers. Reported-by: Ben Dooks <[email protected]> Closes: http://lore.kernel.org/[email protected] Cc: Alison Schofield <[email protected]> Cc: Dave Jiang <[email protected]> Signed-off-by: Dan Williams <[email protected]> Reviewed-by: Alison Schofield <[email protected]> Reviewed-by: Dave Jiang <[email protected]> Link: https://lore.kernel.org/r/170303851337.2238503.5103082574938957743.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Ira Weiny <[email protected]>
1 parent fd045e5 commit a085a5e

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

drivers/acpi/nfit/core.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ static ssize_t bus_dsm_mask_show(struct device *dev,
11861186
struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
11871187
struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
11881188

1189-
return sprintf(buf, "%#lx\n", acpi_desc->bus_dsm_mask);
1189+
return sysfs_emit(buf, "%#lx\n", acpi_desc->bus_dsm_mask);
11901190
}
11911191
static struct device_attribute dev_attr_bus_dsm_mask =
11921192
__ATTR(dsm_mask, 0444, bus_dsm_mask_show, NULL);
@@ -1198,7 +1198,7 @@ static ssize_t revision_show(struct device *dev,
11981198
struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
11991199
struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
12001200

1201-
return sprintf(buf, "%d\n", acpi_desc->acpi_header.revision);
1201+
return sysfs_emit(buf, "%d\n", acpi_desc->acpi_header.revision);
12021202
}
12031203
static DEVICE_ATTR_RO(revision);
12041204

@@ -1209,7 +1209,7 @@ static ssize_t hw_error_scrub_show(struct device *dev,
12091209
struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);
12101210
struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
12111211

1212-
return sprintf(buf, "%d\n", acpi_desc->scrub_mode);
1212+
return sysfs_emit(buf, "%d\n", acpi_desc->scrub_mode);
12131213
}
12141214

12151215
/*
@@ -1278,7 +1278,7 @@ static ssize_t scrub_show(struct device *dev,
12781278
mutex_lock(&acpi_desc->init_mutex);
12791279
busy = test_bit(ARS_BUSY, &acpi_desc->scrub_flags)
12801280
&& !test_bit(ARS_CANCEL, &acpi_desc->scrub_flags);
1281-
rc = sprintf(buf, "%d%s", acpi_desc->scrub_count, busy ? "+\n" : "\n");
1281+
rc = sysfs_emit(buf, "%d%s", acpi_desc->scrub_count, busy ? "+\n" : "\n");
12821282
/* Allow an admin to poll the busy state at a higher rate */
12831283
if (busy && capable(CAP_SYS_RAWIO) && !test_and_set_bit(ARS_POLL,
12841284
&acpi_desc->scrub_flags)) {
@@ -1382,7 +1382,7 @@ static ssize_t handle_show(struct device *dev,
13821382
{
13831383
struct acpi_nfit_memory_map *memdev = to_nfit_memdev(dev);
13841384

1385-
return sprintf(buf, "%#x\n", memdev->device_handle);
1385+
return sysfs_emit(buf, "%#x\n", memdev->device_handle);
13861386
}
13871387
static DEVICE_ATTR_RO(handle);
13881388

@@ -1391,7 +1391,7 @@ static ssize_t phys_id_show(struct device *dev,
13911391
{
13921392
struct acpi_nfit_memory_map *memdev = to_nfit_memdev(dev);
13931393

1394-
return sprintf(buf, "%#x\n", memdev->physical_id);
1394+
return sysfs_emit(buf, "%#x\n", memdev->physical_id);
13951395
}
13961396
static DEVICE_ATTR_RO(phys_id);
13971397

@@ -1400,7 +1400,7 @@ static ssize_t vendor_show(struct device *dev,
14001400
{
14011401
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14021402

1403-
return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->vendor_id));
1403+
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(dcr->vendor_id));
14041404
}
14051405
static DEVICE_ATTR_RO(vendor);
14061406

@@ -1409,7 +1409,7 @@ static ssize_t rev_id_show(struct device *dev,
14091409
{
14101410
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14111411

1412-
return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->revision_id));
1412+
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(dcr->revision_id));
14131413
}
14141414
static DEVICE_ATTR_RO(rev_id);
14151415

@@ -1418,7 +1418,7 @@ static ssize_t device_show(struct device *dev,
14181418
{
14191419
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14201420

1421-
return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->device_id));
1421+
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(dcr->device_id));
14221422
}
14231423
static DEVICE_ATTR_RO(device);
14241424

@@ -1427,7 +1427,7 @@ static ssize_t subsystem_vendor_show(struct device *dev,
14271427
{
14281428
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14291429

1430-
return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->subsystem_vendor_id));
1430+
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(dcr->subsystem_vendor_id));
14311431
}
14321432
static DEVICE_ATTR_RO(subsystem_vendor);
14331433

@@ -1436,7 +1436,7 @@ static ssize_t subsystem_rev_id_show(struct device *dev,
14361436
{
14371437
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14381438

1439-
return sprintf(buf, "0x%04x\n",
1439+
return sysfs_emit(buf, "0x%04x\n",
14401440
be16_to_cpu(dcr->subsystem_revision_id));
14411441
}
14421442
static DEVICE_ATTR_RO(subsystem_rev_id);
@@ -1446,7 +1446,7 @@ static ssize_t subsystem_device_show(struct device *dev,
14461446
{
14471447
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14481448

1449-
return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->subsystem_device_id));
1449+
return sysfs_emit(buf, "0x%04x\n", be16_to_cpu(dcr->subsystem_device_id));
14501450
}
14511451
static DEVICE_ATTR_RO(subsystem_device);
14521452

@@ -1465,7 +1465,7 @@ static ssize_t format_show(struct device *dev,
14651465
{
14661466
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
14671467

1468-
return sprintf(buf, "0x%04x\n", le16_to_cpu(dcr->code));
1468+
return sysfs_emit(buf, "0x%04x\n", le16_to_cpu(dcr->code));
14691469
}
14701470
static DEVICE_ATTR_RO(format);
14711471

@@ -1498,7 +1498,7 @@ static ssize_t format1_show(struct device *dev,
14981498
continue;
14991499
if (nfit_dcr->dcr->code == dcr->code)
15001500
continue;
1501-
rc = sprintf(buf, "0x%04x\n",
1501+
rc = sysfs_emit(buf, "0x%04x\n",
15021502
le16_to_cpu(nfit_dcr->dcr->code));
15031503
break;
15041504
}
@@ -1515,7 +1515,7 @@ static ssize_t formats_show(struct device *dev,
15151515
{
15161516
struct nvdimm *nvdimm = to_nvdimm(dev);
15171517

1518-
return sprintf(buf, "%d\n", num_nvdimm_formats(nvdimm));
1518+
return sysfs_emit(buf, "%d\n", num_nvdimm_formats(nvdimm));
15191519
}
15201520
static DEVICE_ATTR_RO(formats);
15211521

@@ -1524,7 +1524,7 @@ static ssize_t serial_show(struct device *dev,
15241524
{
15251525
struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
15261526

1527-
return sprintf(buf, "0x%08x\n", be32_to_cpu(dcr->serial_number));
1527+
return sysfs_emit(buf, "0x%08x\n", be32_to_cpu(dcr->serial_number));
15281528
}
15291529
static DEVICE_ATTR_RO(serial);
15301530

@@ -1536,7 +1536,7 @@ static ssize_t family_show(struct device *dev,
15361536

15371537
if (nfit_mem->family < 0)
15381538
return -ENXIO;
1539-
return sprintf(buf, "%d\n", nfit_mem->family);
1539+
return sysfs_emit(buf, "%d\n", nfit_mem->family);
15401540
}
15411541
static DEVICE_ATTR_RO(family);
15421542

@@ -1548,7 +1548,7 @@ static ssize_t dsm_mask_show(struct device *dev,
15481548

15491549
if (nfit_mem->family < 0)
15501550
return -ENXIO;
1551-
return sprintf(buf, "%#lx\n", nfit_mem->dsm_mask);
1551+
return sysfs_emit(buf, "%#lx\n", nfit_mem->dsm_mask);
15521552
}
15531553
static DEVICE_ATTR_RO(dsm_mask);
15541554

@@ -1562,7 +1562,7 @@ static ssize_t flags_show(struct device *dev,
15621562
if (test_bit(NFIT_MEM_DIRTY, &nfit_mem->flags))
15631563
flags |= ACPI_NFIT_MEM_FLUSH_FAILED;
15641564

1565-
return sprintf(buf, "%s%s%s%s%s%s%s\n",
1565+
return sysfs_emit(buf, "%s%s%s%s%s%s%s\n",
15661566
flags & ACPI_NFIT_MEM_SAVE_FAILED ? "save_fail " : "",
15671567
flags & ACPI_NFIT_MEM_RESTORE_FAILED ? "restore_fail " : "",
15681568
flags & ACPI_NFIT_MEM_FLUSH_FAILED ? "flush_fail " : "",
@@ -1579,7 +1579,7 @@ static ssize_t id_show(struct device *dev,
15791579
struct nvdimm *nvdimm = to_nvdimm(dev);
15801580
struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);
15811581

1582-
return sprintf(buf, "%s\n", nfit_mem->id);
1582+
return sysfs_emit(buf, "%s\n", nfit_mem->id);
15831583
}
15841584
static DEVICE_ATTR_RO(id);
15851585

@@ -1589,7 +1589,7 @@ static ssize_t dirty_shutdown_show(struct device *dev,
15891589
struct nvdimm *nvdimm = to_nvdimm(dev);
15901590
struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);
15911591

1592-
return sprintf(buf, "%d\n", nfit_mem->dirty_shutdown);
1592+
return sysfs_emit(buf, "%d\n", nfit_mem->dirty_shutdown);
15931593
}
15941594
static DEVICE_ATTR_RO(dirty_shutdown);
15951595

@@ -2172,7 +2172,7 @@ static ssize_t range_index_show(struct device *dev,
21722172
struct nd_region *nd_region = to_nd_region(dev);
21732173
struct nfit_spa *nfit_spa = nd_region_provider_data(nd_region);
21742174

2175-
return sprintf(buf, "%d\n", nfit_spa->spa->range_index);
2175+
return sysfs_emit(buf, "%d\n", nfit_spa->spa->range_index);
21762176
}
21772177
static DEVICE_ATTR_RO(range_index);
21782178

0 commit comments

Comments
 (0)