[PATCH] staging: vboxvideo: make a couple of funcs static

[Craig Kewley]

Fix Sparse warnings:
drivers/staging/vboxvideo/vbox_mode.c:309:6: warning:
symbol 'vbox_primary_atomic_disable' was not declared. Should it be static?

drivers/staging/vboxvideo/vbox_mode.c:452:6: warning:
symbol 'vbox_cursor_atomic_disable' was not declared. Should it be static?

Signed-off-by: Craig Kewley 
---
 drivers/staging/vboxvideo/vbox_mode.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/vboxvideo/vbox_mode.c 
b/drivers/staging/vboxvideo/vbox_mode.c
index 042e4f384df9..deed28c7a1db 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -306,8 +306,8 @@ static void vbox_primary_atomic_update(struct drm_plane 
*plane,
plane->state->src_y >> 16);
 }
 
-void vbox_primary_atomic_disable(struct drm_plane *plane,
-struct drm_plane_state *old_state)
+static void vbox_primary_atomic_disable(struct drm_plane *plane,
+   struct drm_plane_state *old_state)
 {
struct drm_crtc *crtc = old_state->crtc;
 
@@ -449,8 +449,8 @@ static void vbox_cursor_atomic_update(struct drm_plane 
*plane,
mutex_unlock(&vbox->hw_mutex);
 }
 
-void vbox_cursor_atomic_disable(struct drm_plane *plane,
-   struct drm_plane_state *old_state)
+static void vbox_cursor_atomic_disable(struct drm_plane *plane,
+  struct drm_plane_state *old_state)
 {
struct vbox_private *vbox =
container_of(plane->dev, struct vbox_private, ddev);
-- 
2.17.1

[PATCH] staging: octeon: use __func__ instead of func name

[Craig Kewley]

Fix checkpatch warning:
WARNING: Prefer using '"%s...", __func__' to using 'INTERFACE'

Signed-off-by: Craig Kewley 
---
 drivers/staging/octeon/ethernet-util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/octeon/ethernet-util.h 
b/drivers/staging/octeon/ethernet-util.h
index 617da8037a4d..cb5540dc0e9d 100644
--- a/drivers/staging/octeon/ethernet-util.h
+++ b/drivers/staging/octeon/ethernet-util.h
@@ -39,7 +39,7 @@ static inline int INTERFACE(int ipd_port)
interface = cvmx_helper_get_interface_num(ipd_port);
if (interface >= 0)
return interface;
-   panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port);
+   panic("Illegal ipd_port %d passed to %s\n", ipd_port, __func__);
 }
 
 /**
-- 
2.12.2

[PATCH] staging: vt6656: Avoid multiple line dereference

[Craig Kewley]

This patch fixes the checkpatch.pl warning:

WARNING: Avoid multiple line dereference

Signed-off-by: Craig Kewley 
---
 drivers/staging/vt6656/rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index aa59e7f14ab3..7f526c053e0d 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -692,8 +692,8 @@ static u16 vnt_generate_tx_parameter(struct 
vnt_usb_send_context *tx_context,
tx_context->pkt_type == PK_TYPE_11GA) {
if (need_rts) {
if (need_mic)
-   *mic_hdr = &tx_buffer->
-   tx_head.tx_rts.tx.mic.hdr;
+   *mic_hdr =
+   &tx_buffer->tx_head.tx_rts.tx.mic.hdr;
 
return vnt_rxtx_rts(tx_context, &tx_buffer->tx_head,
need_mic);
-- 
2.11.0

[PATCH] staging: bcm2835: do not initialise statics to NULL

[Craig Kewley]

This patch fixes the checkpatch.pl warning:

ERROR: do not initialise statics to NULL

Signed-off-by: Craig Kewley 
---
 drivers/staging/bcm2835-audio/bcm2835.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm2835-audio/bcm2835.c 
b/drivers/staging/bcm2835-audio/bcm2835.c
index 9e3b248c7085..6932492e1834 100644
--- a/drivers/staging/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/bcm2835-audio/bcm2835.c
@@ -34,8 +34,8 @@ static int enable[MAX_SUBSTREAMS] = {[0 ... (MAX_SUBSTREAMS - 
1)] = 1};
  * to debug if we run into issues
  */
 
-static struct snd_card *g_card = NULL;
-static struct bcm2835_chip *g_chip = NULL;
+static struct snd_card *g_card;
+static struct bcm2835_chip *g_chip;
 
 static int snd_bcm2835_free(struct bcm2835_chip *chip)
 {
-- 
2.11.0