[PATCH 1/3] USB: serial: ftdi_sio: clean up attribute visibility logic

From: Johan Hovold
Date: Mon Sep 19 2022 - 09:25:50 EST


Clean up the attribute visibility logic by defaulting to attributes
being visible and explicitly listing the exceptions.

Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
---
drivers/usb/serial/ftdi_sio.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 147b5e80595a..a5fc199cde0b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1775,19 +1775,18 @@ static umode_t ftdi_is_visible(struct kobject *kobj, struct attribute *attr, int
struct usb_serial_port *port = to_usb_serial_port(dev);
struct ftdi_private *priv = usb_get_serial_port_data(port);
enum ftdi_chip_type type = priv->chip_type;
- umode_t mode = attr->mode;

- if (type != SIO) {
- if (attr == &dev_attr_event_char.attr)
- return mode;
+ if (attr == &dev_attr_event_char.attr) {
+ if (type == SIO)
+ return 0;
}

- if (type != SIO && type != FT232A) {
- if (attr == &dev_attr_latency_timer.attr)
- return mode;
+ if (attr == &dev_attr_latency_timer.attr) {
+ if (type == SIO || type == FT232A)
+ return 0;
}

- return 0;
+ return attr->mode;
}

static const struct attribute_group ftdi_group = {
--
2.35.1