Commit d19faf0e authored by Dwaipayan Ray's avatar Dwaipayan Ray Committed by Tony Luck
Browse files

EDAC/amd64: Use DEVICE_ATTR helper macros 



Instead of "open coding" DEVICE_ATTR, use the corresponding
helper macros DEVICE_ATTR_{RW,RO,WO} in amd64_edac.c

Some function names needed to be changed to match the device
conventions <foo>_show and <foo>_store, but the functionality
itself is unchanged.

The devices using EDAC_DCT_ATTR_SHOW() are left unchanged.

Reviewed-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarDwaipayan Ray <dwaipayanray1@gmail.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20210713065130.2151-1-dwaipayanray1@gmail.com
parent e73f0f0e

drivers/edac/amd64_edac.c

+8 −13
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ EDAC_DCT_ATTR_SHOW(dbam0); 
EDAC_DCT_ATTR_SHOW(top_mem);

EDAC_DCT_ATTR_SHOW(top_mem2);



static ssize_t hole_show(struct device *dev, struct device_attribute *mattr,

static ssize_t dram_hole_show(struct device *dev, struct device_attribute *mattr,

			      char *data)

{

	struct mem_ctl_info *mci = to_mci(dev);
@@ -593,7 +593,7 @@ static DEVICE_ATTR(dhar, S_IRUGO, dhar_show, NULL); 
static DEVICE_ATTR(dbam, S_IRUGO, dbam0_show, NULL);

static DEVICE_ATTR(topmem, S_IRUGO, top_mem_show, NULL);

static DEVICE_ATTR(topmem2, S_IRUGO, top_mem2_show, NULL);

static DEVICE_ATTR(dram_hole, S_IRUGO, hole_show, NULL);

static DEVICE_ATTR_RO(dram_hole);



static struct attribute *dbg_attrs[] = {

	&dev_attr_dhar.attr,
@@ -802,16 +802,11 @@ static ssize_t inject_write_store(struct device *dev, 
 * update NUM_INJ_ATTRS in case you add new members

 */



static DEVICE_ATTR(inject_section, S_IRUGO | S_IWUSR,

		   inject_section_show, inject_section_store);

static DEVICE_ATTR(inject_word, S_IRUGO | S_IWUSR,

		   inject_word_show, inject_word_store);

static DEVICE_ATTR(inject_ecc_vector, S_IRUGO | S_IWUSR,

		   inject_ecc_vector_show, inject_ecc_vector_store);

static DEVICE_ATTR(inject_write, S_IWUSR,

		   NULL, inject_write_store);

static DEVICE_ATTR(inject_read,  S_IWUSR,

		   NULL, inject_read_store);

static DEVICE_ATTR_RW(inject_section);

static DEVICE_ATTR_RW(inject_word);

static DEVICE_ATTR_RW(inject_ecc_vector);

static DEVICE_ATTR_WO(inject_write);

static DEVICE_ATTR_WO(inject_read);



static struct attribute *inj_attrs[] = {

	&dev_attr_inject_section.attr,