Skip to content

Commit

Permalink
net: wwan: core: spell port device name in lowercase
Browse files Browse the repository at this point in the history
Usually a device name is spelled in lowercase, let us follow this
practice in the WWAN subsystem as well. The bottom line is that such
name is easier to type.

To keep the device type attribute contents more natural (i.e., spell
abbreviations in uppercase), while making the device name lowercase,
turn the port type strings array to an array of structure that contains
both the port type name and the device name suffix.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sergey Ryazanov authored and David S. Miller committed Jun 8, 2021
1 parent 64cc80c commit 392c26f
Showing 1 changed file with 26 additions and 8 deletions.
34 changes: 26 additions & 8 deletions drivers/net/wwan/wwan_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,38 @@ static void wwan_remove_dev(struct wwan_device *wwandev)

/* ------- WWAN port management ------- */

static const char * const wwan_port_type_str[WWAN_PORT_MAX + 1] = {
[WWAN_PORT_AT] = "AT",
[WWAN_PORT_MBIM] = "MBIM",
[WWAN_PORT_QMI] = "QMI",
[WWAN_PORT_QCDM] = "QCDM",
[WWAN_PORT_FIREHOSE] = "FIREHOSE",
static const struct {
const char * const name; /* Port type name */
const char * const devsuf; /* Port devce name suffix */
} wwan_port_types[WWAN_PORT_MAX + 1] = {
[WWAN_PORT_AT] = {
.name = "AT",
.devsuf = "at",
},
[WWAN_PORT_MBIM] = {
.name = "MBIM",
.devsuf = "mbim",
},
[WWAN_PORT_QMI] = {
.name = "QMI",
.devsuf = "qmi",
},
[WWAN_PORT_QCDM] = {
.name = "QCDM",
.devsuf = "qcdm",
},
[WWAN_PORT_FIREHOSE] = {
.name = "FIREHOSE",
.devsuf = "firehose",
},
};

static ssize_t type_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct wwan_port *port = to_wwan_port(dev);

return sprintf(buf, "%s\n", wwan_port_type_str[port->type]);
return sprintf(buf, "%s\n", wwan_port_types[port->type].name);
}
static DEVICE_ATTR_RO(type);

Expand Down Expand Up @@ -285,7 +303,7 @@ struct wwan_port *wwan_create_port(struct device *parent,
/* create unique name based on wwan device id, port index and type */
dev_set_name(&port->dev, "wwan%up%u%s", wwandev->id,
atomic_inc_return(&wwandev->port_id),
wwan_port_type_str[port->type]);
wwan_port_types[port->type].devsuf);

err = device_register(&port->dev);
if (err)
Expand Down

0 comments on commit 392c26f

Please sign in to comment.