Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210603082218.11718-2-thunder.leizhen@huawei.com

authored by

Zhen Lei and committed by
Kalle Valo
573f1af8 233bc283

+14 -18
+7 -9
drivers/ssb/pci.c
··· 1117 1117 #endif 1118 1118 }; 1119 1119 1120 - static ssize_t ssb_pci_attr_sprom_show(struct device *pcidev, 1121 - struct device_attribute *attr, 1122 - char *buf) 1120 + static ssize_t ssb_sprom_show(struct device *pcidev, 1121 + struct device_attribute *attr, 1122 + char *buf) 1123 1123 { 1124 1124 struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev); 1125 1125 struct ssb_bus *bus; ··· 1131 1131 return ssb_attr_sprom_show(bus, buf, sprom_do_read); 1132 1132 } 1133 1133 1134 - static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev, 1135 - struct device_attribute *attr, 1136 - const char *buf, size_t count) 1134 + static ssize_t ssb_sprom_store(struct device *pcidev, 1135 + struct device_attribute *attr, 1136 + const char *buf, size_t count) 1137 1137 { 1138 1138 struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev); 1139 1139 struct ssb_bus *bus; ··· 1146 1146 sprom_check_crc, sprom_do_write); 1147 1147 } 1148 1148 1149 - static DEVICE_ATTR(ssb_sprom, 0600, 1150 - ssb_pci_attr_sprom_show, 1151 - ssb_pci_attr_sprom_store); 1149 + static DEVICE_ATTR_ADMIN_RW(ssb_sprom); 1152 1150 1153 1151 void ssb_pci_exit(struct ssb_bus *bus) 1154 1152 {
+7 -9
drivers/ssb/pcmcia.c
··· 723 723 return -ENODEV; 724 724 } 725 725 726 - static ssize_t ssb_pcmcia_attr_sprom_show(struct device *pcmciadev, 727 - struct device_attribute *attr, 728 - char *buf) 726 + static ssize_t ssb_sprom_show(struct device *pcmciadev, 727 + struct device_attribute *attr, 728 + char *buf) 729 729 { 730 730 struct pcmcia_device *pdev = 731 731 container_of(pcmciadev, struct pcmcia_device, dev); ··· 739 739 ssb_pcmcia_sprom_read_all); 740 740 } 741 741 742 - static ssize_t ssb_pcmcia_attr_sprom_store(struct device *pcmciadev, 743 - struct device_attribute *attr, 744 - const char *buf, size_t count) 742 + static ssize_t ssb_sprom_store(struct device *pcmciadev, 743 + struct device_attribute *attr, 744 + const char *buf, size_t count) 745 745 { 746 746 struct pcmcia_device *pdev = 747 747 container_of(pcmciadev, struct pcmcia_device, dev); ··· 756 756 ssb_pcmcia_sprom_write_all); 757 757 } 758 758 759 - static DEVICE_ATTR(ssb_sprom, 0600, 760 - ssb_pcmcia_attr_sprom_show, 761 - ssb_pcmcia_attr_sprom_store); 759 + static DEVICE_ATTR_ADMIN_RW(ssb_sprom); 762 760 763 761 static int ssb_pcmcia_cor_setup(struct ssb_bus *bus, u8 cor) 764 762 {