Re: [PATCH 9/9] staging: ks7010: Delete three unnecessary variable initialisations
From: Julia Lawall
Date: Sun Jul 17 2016 - 14:51:51 EST
On Sun, 17 Jul 2016, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> Date: Sun, 17 Jul 2016 19:40:47 +0200
>
> Three variables will be set to an appropriate value a bit later.
> Thus omit the explicit initialisation at the beginning.
>
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/staging/ks7010/ks7010_sdio.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
> index e06bc3c..3c62c57 100644
> --- a/drivers/staging/ks7010/ks7010_sdio.c
> +++ b/drivers/staging/ks7010/ks7010_sdio.c
> @@ -323,14 +323,14 @@ static void tx_device_task(void *dev)
> {
> struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
> struct tx_device_buffer *sp;
> - int rc = 0;
>
> DPRINTK(4, "\n");
> if (cnt_txqbody(priv) > 0
> && atomic_read(&priv->psstatus.status) != PS_SNOOZE) {
> sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qhead];
> if (priv->dev_state >= DEVICE_STATE_BOOT) {
> - rc = write_to_device(priv, sp->sendp, sp->size);
> + int rc = write_to_device(priv, sp->sendp, sp->size);
This does not look appealing to me, neither the declaration in the middle
of the function, nor the intiialization to the result of a complex
expression, nor the separation of the call and the error checking code by
a blank line. There is nothing wrong with having the rc variable be
declared at the the top of the function, in its normal place.
julia
> +
> if (rc) {
> DPRINTK(1, "write_to_device error !!(%d)\n",
> rc);
> @@ -358,7 +358,7 @@ int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
> void (*complete_handler) (void *arg1, void *arg2),
> void *arg1, void *arg2)
> {
> - int result = 0;
> + int result;
> struct hostif_hdr *hdr;
> hdr = (struct hostif_hdr *)p;
>
> @@ -737,7 +737,7 @@ free_buf:
> static int ks7010_upload_firmware(struct ks_wlan_private *priv,
> struct ks_sdio_card *card)
> {
> - unsigned int size, offset, n = 0;
> + unsigned int size, offset, n;
> unsigned char *rom_buf;
> unsigned char rw_data = 0;
> int retval, rc = 0;
> --
> 2.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>