Commits · 3604af50a24ec45f76088e2da7bfb5758a5c1d7b · Kirill Smelkov / linux

13 Oct, 2015 40 commits

staging: wilc1000: move open brace in line with control flow statement · 3604af50

Alison Schofield authored Oct 12, 2015

Move open braces to be in line with "if" control flow statements.
Addresses checkpatch.pl:
	ERROR: that open brace { should be on the previous line
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3604af50

Staging: wilc1000: linux_wlan: Remove NULL check before kfree · fbeb0dab

Shraddha Barke authored Oct 12, 2015

kfree on NULL pointer is a no-op.

The semantic patch used -

// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);
@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>smpl>
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fbeb0dab

Staging: wilc1000: wilc_wfi_cfgoperations: Remove NULL check before kfree · cccfc39e

Shraddha Barke authored Oct 12, 2015

kfree on NULL pointer is a no-op.

The semantic patch used-

// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);
@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>smpl>
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

cccfc39e

Staging: wilc1000: wilc_msgqueue: Use kmemdup instead of kmalloc and memcpy · c22cbec0

Shraddha Barke authored Oct 11, 2015

Replace kmalloc and memcpy with kmemdup.
Problem found using coccicheck
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c22cbec0

staging: wilc1000: remove braces around single statement blocks · 39823a50

Alison Schofield authored Oct 08, 2015

Remove excess braces as suggested by checkpatch.pl:
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

39823a50

staging: wilc1000: linux_wlan_spi: include header · 56293ff2

Stanislav Kholmanskikh authored Oct 08, 2015

A check using 'sparse' shows warnings in linux_wlan_spi.c:

drivers/staging/wilc1000/linux_wlan_spi.c:43:19: warning: symbol 'wilc_spi_dev' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:71:19: warning: symbol 'wilc_bus' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:95:5: warning: symbol 'linux_spi_init' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:195:5: warning: symbol 'linux_spi_write' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:320:5: warning: symbol 'linux_spi_read' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:365:5: warning: symbol 'linux_spi_write_read' was not declared. Should it be static?
drivers/staging/wilc1000/linux_wlan_spi.c:402:5: warning: symbol 'linux_spi_set_max_speed' was not declared. Should it be static?

Let's avoid it by including "linux_wlan_spi.h" header.
Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

56293ff2

staging: wilc1000: linux_wlan_spi: correct types · 6b69b4f0

Stanislav Kholmanskikh authored Oct 08, 2015

linux_spi_write(), linux_spi_read(), linux_spi_write_read():

    nwi->io_func.u.spi.spi_tx = linux_spi_write;
    nwi->io_func.u.spi.spi_rx = linux_spi_read;
    nwi->io_func.u.spi.spi_trx = linux_spi_write_read;

are expected to accept arguments of 'u8 *', u32 types:

    struct {
        int (*spi_max_speed)(void);
        int (*spi_tx)(u8 *, u32);
        int (*spi_rx)(u8 *, u32);
        int (*spi_trx)(u8 *, u8 *, u32);
    } spi;

However, linux_spi_read() and linux_spi_write_read() do not do this,
they use 'unsigned char *' and 'unsigned long' instead.

Changed the types of their arguments to satisfy the expectations.
Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6b69b4f0