USB: gadget: f_mass_storage: get rid of DEVICE_ATTR() usage
Greg Kroah-Hartman
maintainerPATCH 1/1 USB: gadget: f_mass_storage: get rid of DEVICE_ATTR() usage
The last holdout in the drivers/usb/* tree using DEVICE_ATTR() is the f_mass_storage driver, so move it to use DEVICE_ATTR_RW() instead. The mode is overridden in the is_visible callback to set it properly depending on if this is a cdrom or removable device.
Cc Felipe Balbi <[email protected]>
Cc Alan Stern <[email protected]>
Cc Maxim Devaev <[email protected]>
Cc Wesley Cheng <[email protected]>
Cc Neal Liu <[email protected]>
Cc Roger Quadros <[email protected]>
Cc Nikita Yushchenko <[email protected]>
Cc Cai Huoqing <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/usb/gadget/function/f_mass_storage.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/usb/gadget/function/f_mass_storage.c +8 -3
@@ -2662,11 +2662,16 @@ static ssize_t forced_eject_store(struct device *dev, }static DEVICE_ATTR_RW (nofua); -/* mode wil be set in fsg_lun_attr_is_visible() */ -static DEVICE_ATTR(ro, 0, ro_show, ro_store); -static DEVICE_ATTR(file, 0, file_show, file_store);static DEVICE_ATTR_WO (forced_eject); +/* +* Mode of the ro and file attribute files will be overridden in +* fsg_lun_dev_is_visible() depending on if this is a cdrom, or if it is a +* removable device. +*/ +static DEVICE_ATTR_RW (ro); +static DEVICE_ATTR_RW (file); +/****************************** FSG COMMON ******************************/ static void fsg_lun_release (struct device *dev)
Signature · 1 line
2.37.1