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

xen: xen-pciback: remove DRIVER_ATTR() usage

It's better to be explicit and use the DRIVER_ATTR_RW() and
DRIVER_ATTR_RO() macros when defining a driver's sysfs file.

Bonus is this fixes up a checkpatch.pl warning.

This is part of a series to drop DRIVER_ATTR() from the tree entirely.

Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+20 -24
+20 -24
drivers/xen/xen-pciback/pci_stub.c
··· 1172 1172 return err; 1173 1173 } 1174 1174 1175 - static ssize_t pcistub_slot_add(struct device_driver *drv, const char *buf, 1176 - size_t count) 1175 + static ssize_t new_slot_store(struct device_driver *drv, const char *buf, 1176 + size_t count) 1177 1177 { 1178 1178 int domain, bus, slot, func; 1179 1179 int err; ··· 1189 1189 err = count; 1190 1190 return err; 1191 1191 } 1192 - static DRIVER_ATTR(new_slot, S_IWUSR, NULL, pcistub_slot_add); 1192 + static DRIVER_ATTR_WO(new_slot); 1193 1193 1194 - static ssize_t pcistub_slot_remove(struct device_driver *drv, const char *buf, 1195 - size_t count) 1194 + static ssize_t remove_slot_store(struct device_driver *drv, const char *buf, 1195 + size_t count) 1196 1196 { 1197 1197 int domain, bus, slot, func; 1198 1198 int err; ··· 1208 1208 err = count; 1209 1209 return err; 1210 1210 } 1211 - static DRIVER_ATTR(remove_slot, S_IWUSR, NULL, pcistub_slot_remove); 1211 + static DRIVER_ATTR_WO(remove_slot); 1212 1212 1213 - static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf) 1213 + static ssize_t slots_show(struct device_driver *drv, char *buf) 1214 1214 { 1215 1215 struct pcistub_device_id *pci_dev_id; 1216 1216 size_t count = 0; ··· 1231 1231 1232 1232 return count; 1233 1233 } 1234 - static DRIVER_ATTR(slots, S_IRUSR, pcistub_slot_show, NULL); 1234 + static DRIVER_ATTR_RO(slots); 1235 1235 1236 - static ssize_t pcistub_irq_handler_show(struct device_driver *drv, char *buf) 1236 + static ssize_t irq_handlers_show(struct device_driver *drv, char *buf) 1237 1237 { 1238 1238 struct pcistub_device *psdev; 1239 1239 struct xen_pcibk_dev_data *dev_data; ··· 1260 1260 spin_unlock_irqrestore(&pcistub_devices_lock, flags); 1261 1261 return count; 1262 1262 } 1263 - static DRIVER_ATTR(irq_handlers, S_IRUSR, pcistub_irq_handler_show, NULL); 1263 + static DRIVER_ATTR_RO(irq_handlers); 1264 1264 1265 - static ssize_t pcistub_irq_handler_switch(struct device_driver *drv, 1266 - const char *buf, 1267 - size_t count) 1265 + static ssize_t irq_handler_state_store(struct device_driver *drv, 1266 + const char *buf, size_t count) 1268 1267 { 1269 1268 struct pcistub_device *psdev; 1270 1269 struct xen_pcibk_dev_data *dev_data; ··· 1300 1301 err = count; 1301 1302 return err; 1302 1303 } 1303 - static DRIVER_ATTR(irq_handler_state, S_IWUSR, NULL, 1304 - pcistub_irq_handler_switch); 1304 + static DRIVER_ATTR_WO(irq_handler_state); 1305 1305 1306 - static ssize_t pcistub_quirk_add(struct device_driver *drv, const char *buf, 1307 - size_t count) 1306 + static ssize_t quirks_store(struct device_driver *drv, const char *buf, 1307 + size_t count) 1308 1308 { 1309 1309 int domain, bus, slot, func, reg, size, mask; 1310 1310 int err; ··· 1321 1323 return err; 1322 1324 } 1323 1325 1324 - static ssize_t pcistub_quirk_show(struct device_driver *drv, char *buf) 1326 + static ssize_t quirks_show(struct device_driver *drv, char *buf) 1325 1327 { 1326 1328 int count = 0; 1327 1329 unsigned long flags; ··· 1364 1366 1365 1367 return count; 1366 1368 } 1367 - static DRIVER_ATTR(quirks, S_IRUSR | S_IWUSR, pcistub_quirk_show, 1368 - pcistub_quirk_add); 1369 + static DRIVER_ATTR_RW(quirks); 1369 1370 1370 - static ssize_t permissive_add(struct device_driver *drv, const char *buf, 1371 - size_t count) 1371 + static ssize_t permissive_store(struct device_driver *drv, const char *buf, 1372 + size_t count) 1372 1373 { 1373 1374 int domain, bus, slot, func; 1374 1375 int err; ··· 1428 1431 spin_unlock_irqrestore(&pcistub_devices_lock, flags); 1429 1432 return count; 1430 1433 } 1431 - static DRIVER_ATTR(permissive, S_IRUSR | S_IWUSR, permissive_show, 1432 - permissive_add); 1434 + static DRIVER_ATTR_RW(permissive); 1433 1435 1434 1436 static void pcistub_exit(void) 1435 1437 {