Commit a72319bf authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: apply 80-columns rule to strings 



Strings are allowed to exceed 80 columns but, in this case, the format
arguments should be placed on a new line. Apply this rule to the whole
code of the driver.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200515083325.378539-3-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9773cf1c

drivers/staging/wfx/bus_sdio.c

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ static int wfx_sdio_probe(struct sdio_func *func, 
	int ret;



	if (func->num != 1) {

		dev_err(&func->dev, "SDIO function number is %d while it should always be 1 (unsupported chip?)\n", func->num);

		dev_err(&func->dev, "SDIO function number is %d while it should always be 1 (unsupported chip?)\n",

			func->num);

		return -ENODEV;

	}

drivers/staging/wfx/data_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -550,8 +550,8 @@ void wfx_tx_confirm_cb(struct wfx_vif *wvif, const struct hif_cnf_tx *arg) 
		}

	}

	if (tx_count)

		dev_dbg(wvif->wdev->dev,

			"%d more retries than expected\n", tx_count);

		dev_dbg(wvif->wdev->dev, "%d more retries than expected\n",

			tx_count);

	skb_trim(skb, skb->len - wfx_tx_get_icv_len(tx_priv->hw_key));



	// From now, you can touch to tx_info->status, but do not touch to

drivers/staging/wfx/fwio.c

+4 −4
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ static int get_firmware(struct wfx_dev *wdev, u32 keyset_chip, 
	const char *data;

	int ret;



	snprintf(filename, sizeof(filename), "%s_%02X.sec", wdev->pdata.file_fw,

		 keyset_chip);

	snprintf(filename, sizeof(filename), "%s_%02X.sec",

		 wdev->pdata.file_fw, keyset_chip);

	ret = firmware_request_nowarn(fw, filename, wdev->dev);

	if (ret) {

		dev_info(wdev->dev, "can't load %s, falling back to %s.sec\n",
@@ -325,8 +325,8 @@ static int init_gpr(struct wfx_dev *wdev) 
				     gpr_init[i].value);

		if (ret < 0)

			return ret;

		dev_dbg(wdev->dev, "  index %02x: %08x\n", gpr_init[i].index,

			gpr_init[i].value);

		dev_dbg(wdev->dev, "  index %02x: %08x\n",

			gpr_init[i].index, gpr_init[i].value);

	}

	return 0;

}

drivers/staging/wfx/hif_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ int hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, 
	ret = wfx_cmd_send(wdev, hif, reply, buf_len, false);



	if (!ret && mib_id != le16_to_cpu(reply->mib_id)) {

		dev_warn(wdev->dev,

			 "%s: confirmation mismatch request\n", __func__);

		dev_warn(wdev->dev, "%s: confirmation mismatch request\n",

			 __func__);

		ret = -EIO;

	}

	if (ret == -ENOMEM)

drivers/staging/wfx/main.c

+10 −7
Original line number Diff line number Diff line
@@ -192,12 +192,12 @@ struct gpio_desc *wfx_get_gpio(struct device *dev, 
		if (!ret || PTR_ERR(ret) == -ENOENT)

			dev_warn(dev, "gpio %s is not defined\n", label);

		else

			dev_warn(dev,

				 "error while requesting gpio %s\n", label);

			dev_warn(dev, "error while requesting gpio %s\n",

				 label);

		ret = NULL;

	} else {

		dev_dbg(dev,

			"using gpio %d for %s\n", desc_to_gpio(ret), label);

		dev_dbg(dev, "using gpio %d for %s\n",

			desc_to_gpio(ret), label);

	}

	return ret;

}
@@ -230,15 +230,18 @@ int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) 
			ret = hif_configuration(wdev, buf + start,

						i - start + 1);

			if (ret > 0) {

				dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported options?)\n", start, i);

				dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported options?)\n",

					start, i);

				return -EINVAL;

			}

			if (ret == -ETIMEDOUT) {

				dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted file?)\n", start, i);

				dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted file?)\n",

					start, i);

				return ret;

			}

			if (ret) {

				dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown error\n", start, i);

				dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown error\n",

					start, i);

				return -EIO;

			}

			buf[i] = ',';