Commit 573f1af8 authored by Zhen Lei's avatar Zhen Lei Committed by Kalle Valo
Browse files

ssb: use DEVICE_ATTR_ADMIN_RW() helper macro 



Use DEVICE_ATTR_ADMIN_RW() helper macro instead of DEVICE_ATTR(), making
it simpler and easier to read.

Because the read and write function names of the sysfs attribute have been
normalized, there is a natural association.

Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210603082218.11718-2-thunder.leizhen@huawei.com
parent 233bc283

drivers/ssb/pci.c

+7 −9
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ const struct ssb_bus_ops ssb_pci_ops = { 
#endif

};



static ssize_t ssb_pci_attr_sprom_show(struct device *pcidev,

static ssize_t ssb_sprom_show(struct device *pcidev,

			      struct device_attribute *attr,

			      char *buf)

{
@@ -1131,7 +1131,7 @@ static ssize_t ssb_pci_attr_sprom_show(struct device *pcidev, 
	return ssb_attr_sprom_show(bus, buf, sprom_do_read);

}



static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev,

static ssize_t ssb_sprom_store(struct device *pcidev,

			       struct device_attribute *attr,

			       const char *buf, size_t count)

{
@@ -1146,9 +1146,7 @@ static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev, 
				    sprom_check_crc, sprom_do_write);

}



static DEVICE_ATTR(ssb_sprom, 0600,

		   ssb_pci_attr_sprom_show,

		   ssb_pci_attr_sprom_store);

static DEVICE_ATTR_ADMIN_RW(ssb_sprom);



void ssb_pci_exit(struct ssb_bus *bus)

{

drivers/ssb/pcmcia.c

+7 −9
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus, 
	return -ENODEV;

}



static ssize_t ssb_pcmcia_attr_sprom_show(struct device *pcmciadev,

static ssize_t ssb_sprom_show(struct device *pcmciadev,

			      struct device_attribute *attr,

			      char *buf)

{
@@ -739,7 +739,7 @@ static ssize_t ssb_pcmcia_attr_sprom_show(struct device *pcmciadev, 
				   ssb_pcmcia_sprom_read_all);

}



static ssize_t ssb_pcmcia_attr_sprom_store(struct device *pcmciadev,

static ssize_t ssb_sprom_store(struct device *pcmciadev,

			       struct device_attribute *attr,

			       const char *buf, size_t count)

{
@@ -756,9 +756,7 @@ static ssize_t ssb_pcmcia_attr_sprom_store(struct device *pcmciadev, 
				    ssb_pcmcia_sprom_write_all);

}



static DEVICE_ATTR(ssb_sprom, 0600,

		   ssb_pcmcia_attr_sprom_show,

		   ssb_pcmcia_attr_sprom_store);

static DEVICE_ATTR_ADMIN_RW(ssb_sprom);



static int ssb_pcmcia_cor_setup(struct ssb_bus *bus, u8 cor)

{