github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge patch series "can: etas_es58x: clean-up of new GCC W=1 and old checkpatch warnings"

Browse Source 
Vincent Mailhol <mailhol.vincent@wanadoo.fr> says:

The kernel recently added new warnings, one of which triggers a known
false positive on the etas_es58x module. In an effort to keep
es58x_etas free of any W=12 (excluding those produced by foreign
headers), add a workaround to silence it.

While at it, this series also fix a checkpatch warning which I knew
existed for a long time but was too lazy to tackle.

v2 -> v3:
* if the parsing of one of the version/revision numbers fail,
  es58x_parse_product_info() immediately returns. If this occurs early,
  the other version/revision numbers would still be set to zero (which
  is now considered a valid version number). Set the version and
  revision to an invalid number before starting the parsing so that
  everything is set even if an early return occurs.

v1 -> v2:
* v1 had two different check logics for the version numbers:
  - check that none of the sub-version number are zero to make sure
    the parsing succeeded
  - check that all of the sub-version number fit the expected digit
    range to please GCC.

  v2 simplifies things by merging those two logics together.

Link: https://lore.kernel.org/all/20230924110914.183898-1-mailhol.vincent@wanadoo.fr
[mkl: fixed typos]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2023-10-04 11:46:27 +02:00
commit 2806d74deb
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/can/usb/etas_es58x/es58x_core.c
View File

@ -2230,6 +2230,7 @@ static int es58x_probe(struct usb_interface *intf,
for (ch_idx = 0; ch_idx < es58x_dev->num_can_ch; ch_idx++) { for (ch_idx = 0; ch_idx < es58x_dev->num_can_ch; ch_idx++) {
int ret = es58x_init_netdev(es58x_dev, ch_idx); int ret = es58x_init_netdev(es58x_dev, ch_idx);
if (ret) { if (ret) {
es58x_free_netdevs(es58x_dev); es58x_free_netdevs(es58x_dev);
return ret; return ret;

6
drivers/net/can/usb/etas_es58x/es58x_core.h
View File

@ -378,13 +378,13 @@ struct es58x_sw_version {
/** /**
* struct es58x_hw_revision - Hardware revision number. * struct es58x_hw_revision - Hardware revision number.
* @letter: Revision letter. * @letter: Revision letter, an alphanumeric character.
* @major: Version major number, represented on three digits. * @major: Version major number, represented on three digits.
* @minor: Version minor number, represented on three digits. * @minor: Version minor number, represented on three digits.
* *
* The hardware revision uses its own format: "axxx/xxx" where 'a' is * The hardware revision uses its own format: "axxx/xxx" where 'a' is
* a letter and 'x' a digit. It can be retrieved from the product * an alphanumeric character and 'x' a digit. It can be retrieved from
* information string. * the product information string.
*/ */
struct es58x_hw_revision { struct es58x_hw_revision {
char letter; char letter;

57
drivers/net/can/usb/etas_es58x/es58x_devlink.c
View File

@ -125,14 +125,28 @@ static int es58x_parse_hw_rev(struct es58x_device *es58x_dev,
* firmware version, the bootloader version and the hardware * firmware version, the bootloader version and the hardware
* revision. * revision.
* *
* If the function fails, simply emit a log message and continue * If the function fails, set the version or revision to an invalid
* because product information is not critical for the driver to * value and emit an informal message. Continue probing because the
* operate. * product information is not critical for the driver to operate.
*/ */
void es58x_parse_product_info(struct es58x_device *es58x_dev) void es58x_parse_product_info(struct es58x_device *es58x_dev)
{ {
static const struct es58x_sw_version sw_version_not_set = {
.major = -1,
.minor = -1,
.revision = -1,
};
static const struct es58x_hw_revision hw_revision_not_set = {
.letter = '\0',
.major = -1,
.minor = -1,
};
char *prod_info; char *prod_info;
es58x_dev->firmware_version = sw_version_not_set;
es58x_dev->bootloader_version = sw_version_not_set;
es58x_dev->hardware_revision = hw_revision_not_set;
prod_info = usb_cache_string(es58x_dev->udev, ES58X_PROD_INFO_IDX); prod_info = usb_cache_string(es58x_dev->udev, ES58X_PROD_INFO_IDX);
if (!prod_info) { if (!prod_info) {
dev_warn(es58x_dev->dev, dev_warn(es58x_dev->dev,
@ -150,29 +164,36 @@ void es58x_parse_product_info(struct es58x_device *es58x_dev)
} }
/** /**
* es58x_sw_version_is_set() - Check if the version is a valid number. * es58x_sw_version_is_valid() - Check if the version is a valid number.
* @sw_ver: Version number of either the firmware or the bootloader. * @sw_ver: Version number of either the firmware or the bootloader.
* *
* If &es58x_sw_version.major, &es58x_sw_version.minor and * If any of the software version sub-numbers do not fit on two
* &es58x_sw_version.revision are all zero, the product string could * digits, the version is invalid, most probably because the product
* not be parsed and the version number is invalid. * string could not be parsed.
*
* Return: @true if the software version is valid, @false otherwise.
*/ */
static inline bool es58x_sw_version_is_set(struct es58x_sw_version *sw_ver) static inline bool es58x_sw_version_is_valid(struct es58x_sw_version *sw_ver)
{ {
return sw_ver->major || sw_ver->minor || sw_ver->revision; return sw_ver->major < 100 && sw_ver->minor < 100 &&
sw_ver->revision < 100;
} }
/** /**
* es58x_hw_revision_is_set() - Check if the revision is a valid number. * es58x_hw_revision_is_valid() - Check if the revision is a valid number.
* @hw_rev: Revision number of the hardware. * @hw_rev: Revision number of the hardware.
* *
* If &es58x_hw_revision.letter is the null character, the product * If &es58x_hw_revision.letter is not a alphanumeric character or if
* string could not be parsed and the hardware revision number is * any of the hardware revision sub-numbers do not fit on three
* invalid. * digits, the revision is invalid, most probably because the product
* string could not be parsed.
*
* Return: @true if the hardware revision is valid, @false otherwise.
*/ */
static inline bool es58x_hw_revision_is_set(struct es58x_hw_revision *hw_rev) static inline bool es58x_hw_revision_is_valid(struct es58x_hw_revision *hw_rev)
{ {
return hw_rev->letter != '\0'; return isalnum(hw_rev->letter) && hw_rev->major < 1000 &&
hw_rev->minor < 1000;
} }
/** /**
@ -197,7 +218,7 @@ static int es58x_devlink_info_get(struct devlink *devlink,
char buf[max(sizeof("xx.xx.xx"), sizeof("axxx/xxx"))]; char buf[max(sizeof("xx.xx.xx"), sizeof("axxx/xxx"))];
int ret = 0; int ret = 0;
if (es58x_sw_version_is_set(fw_ver)) { if (es58x_sw_version_is_valid(fw_ver)) {
snprintf(buf, sizeof(buf), "%02u.%02u.%02u", snprintf(buf, sizeof(buf), "%02u.%02u.%02u",
fw_ver->major, fw_ver->minor, fw_ver->revision); fw_ver->major, fw_ver->minor, fw_ver->revision);
ret = devlink_info_version_running_put(req, ret = devlink_info_version_running_put(req,
@ -207,7 +228,7 @@ static int es58x_devlink_info_get(struct devlink *devlink,
return ret; return ret;
} }
if (es58x_sw_version_is_set(bl_ver)) { if (es58x_sw_version_is_valid(bl_ver)) {
snprintf(buf, sizeof(buf), "%02u.%02u.%02u", snprintf(buf, sizeof(buf), "%02u.%02u.%02u",
bl_ver->major, bl_ver->minor, bl_ver->revision); bl_ver->major, bl_ver->minor, bl_ver->revision);
ret = devlink_info_version_running_put(req, ret = devlink_info_version_running_put(req,
@ -217,7 +238,7 @@ static int es58x_devlink_info_get(struct devlink *devlink,
return ret; return ret;
} }
if (es58x_hw_revision_is_set(hw_rev)) { if (es58x_hw_revision_is_valid(hw_rev)) {
snprintf(buf, sizeof(buf), "%c%03u/%03u", snprintf(buf, sizeof(buf), "%c%03u/%03u",
hw_rev->letter, hw_rev->major, hw_rev->minor); hw_rev->letter, hw_rev->major, hw_rev->minor);
ret = devlink_info_version_fixed_put(req, ret = devlink_info_version_fixed_put(req,