Greg KH | 18 Apr 23:38 2014

[GIT PULL] Staging driver fixes for 3.15-rc2

The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

  Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/ tags/staging-3.15-rc2

for you to fetch changes up to 33c84bc14c25074ac14644cf7db75a57e9abaf1a:

  staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0 (2014-04-16
13:07:19 -0700)

----------------------------------------------------------------
staging driver fixes for 3.15-rc2

Here are a few staging driver fixes for issues that have been reported
for 3.15-rc2.

Also dominating the diffstat for the pull request is the removal of the
rtl8187se driver.  It's no longer needed in staging as a "real" driver
for this hardware is now merged in the tree in the "correct" location in
drivers/net/

All of these patches have been tested in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh <at> linuxfoundation.org>

----------------------------------------------------------------
Arnd Bergmann (1):
(Continue reading)

Konrad Zapalowicz | 18 Apr 23:31 2014
Picon

[PATCH 0/2] staging: rtl8188eu: fix checkpatch errors.

From: Konrad M Zapalowicz <bergo.torino <at> gmail.com>

This patch removes the following checkpatch errors:

rtl8188eu/core/rtw_p2p.c:
    - 1508: ERROR: code indent should use tabs where possible
    - 1509: ERROR: code indent should use tabs where possible
    - 1510: ERROR: code indent should use tabs where possible
rtl8188eu/core/rtw_recv.c
    - 1874: ERROR: code indent should use tabs where possible

Konrad M Zapalowicz (2):
  staging: rtl8188eu: fix spaces instead of tabs for rtw_p2p.c
  staging: rtl8188eu: fix spaces instead of tabs for rtw_recv.c

 drivers/staging/rtl8188eu/core/rtw_p2p.c  | 6 +++---
 drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--

-- 
1.8.1.2
Antoine Schweitzer-Chaput | 18 Apr 23:18 2014
Picon

[PATCH 1/1] Fix some lines over 80 characters in imx-drm staging driver

From 73eb48f2b376c56f0a354ea0e6c2c71972aaffae Mon Sep 17 00:00:00 2001
From: Antoine Schweitzer-Chaput <antoine <at> schweitzer-chaput.fr>
Date: Wed, 16 Apr 2014 09:59:26 +0200
Subject: [PATCH 1/1] Fix some lines over 80 characters in imx-drm
staging driver

Signed-off-by: Antoine Schweitzer-Chaput <antoine <at> schweitzer-chaput.fr>
---
 drivers/staging/imx-drm/ipu-v3/ipu-common.c | 6 ++++--
 drivers/staging/imx-drm/ipu-v3/ipu-dc.c     | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c
b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index ca85d3d..0ea00de 100644
--- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
 <at>  <at>  -900,7 +900,8  <at>  <at>  static void ipu_irq_handle(struct ipu_soc *ipu,
const int *regs, int num_regs)
 		status &= ipu_cm_read(ipu, IPU_INT_CTRL(regs[i]));

 		for_each_set_bit(bit, &status, 32) {
-			irq = irq_linear_revmap(ipu->domain, regs[i] * 32 + bit);
+			irq = irq_linear_revmap(ipu->domain,
+						regs[i] * 32 + bit);
 			if (irq)
 				generic_handle_irq(irq);
 		}
 <at>  <at>  -1053,7 +1054,8  <at>  <at>  static int ipu_irq_init(struct ipu_soc *ipu)
 	}
(Continue reading)

Bojan Prtvar | 18 Apr 19:57 2014
Picon

[PATCH] Staging: crystalhd: Mark local functions as static

This fixes the following sparse warnings:
drivers/staging/crystalhd/crystalhd_lnx.c:631:5: warning: symbol 'chd_dec_pci_suspend' was not
declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:665:5: warning: symbol 'chd_dec_pci_resume' was not
declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:78:29: warning: symbol 'chd_dec_alloc_iodata' was not
declared. Should it be static?
drivers/staging/crystalhd/crystalhd_lnx.c:99:6: warning: symbol 'chd_dec_free_iodata' was not
declared. Should it be static?

Signed-off-by: Bojan Prtvar <prtvar.b <at> gmail.com>
---
 drivers/staging/crystalhd/crystalhd_lnx.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index c1f6163..590e0b8 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
 <at>  <at>  -75,8 +75,8  <at>  <at>  static int chd_dec_disable_int(struct crystalhd_adp *adp)
 	return 0;
 }

-struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
-					 bool isr)
+static struct crystalhd_ioctl_data *
+chd_dec_alloc_iodata(struct crystalhd_adp *adp, bool isr)
 {
 	unsigned long flags = 0;
 	struct crystalhd_ioctl_data *temp;
(Continue reading)

Sean MacLennan | 18 Apr 19:36 2014
Picon

r8192e_pci driver broken 3.14+

Commit 198e0d17c on November 2 by Rashika Kheria breaks the r8192e_pci
driver on my laptop. The bulk of the commit is fine. It is just the
following change that causes grief:

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 3183627..7796488 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
 <at>  <at>  -171,7 +171,7  <at>  <at>  inline int rtllib_put_snap(u8 *data, u16 h_proto)
	snap->oui[1] = oui[1];
	snap->oui[2] = oui[2];

-	*(u16 *)(data + SNAP_SIZE) = htons(h_proto);
+	*(u16 *)(data + SNAP_SIZE) = h_proto;

	return SNAP_SIZE + sizeof(u16);
 }

I am not sure what platform this was tested on, but I believe for any
little endian machine the htons() is required. Reverting this part of
the commit gets me a working driver. I sent this email using it ;)

Sorry it took so long to report, I don't really use the wireless in
the winter.

Cheers,
   Sean
Bastien Armand | 18 Apr 18:10 2014
Picon

[PATCH v2 2/2] staging: panel: fix sparse warnings in lcd_write

This patch fixes two sparse warnings related to lcd_write :
warning: incorrect type in argument 1 (different address spaces)
warning: incorrect type in initializer (incompatible argument 2 
(different address spaces))

lcd_write can be used from kernel space (in panel_lcd_print) or from user
space. So we introduce the lcd_write_char function that will write a char to
the device. We modify lcd_write and panel_lcd_print to use it. Finally we add
__user annotation missing in lcd_write.

Signed-off-by: Bastien Armand <armand.bastien <at> laposte.net>
---
 drivers/staging/panel/panel.c |  205 ++++++++++++++++++++++-------------------
 1 file changed, 109 insertions(+), 96 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 1569e26..dc34254 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
 <at>  <at>  -1217,111 +1217,113  <at>  <at>  static inline int handle_lcd_special_code(void)
 	return processed;
 }

+static void lcd_write_char(char c)
+{
+	/* first, we'll test if we're in escape mode */
+	if ((c != '\n') && lcd_escape_len >= 0) {
+		/* yes, let's add this char to the buffer */
+		lcd_escape[lcd_escape_len++] = c;
+		lcd_escape[lcd_escape_len] = 0;
(Continue reading)

Bastien Armand | 18 Apr 18:10 2014
Picon

[PATCH v2 1/2] staging: panel: fix sparse warnings in keypad_read

This patch fixes two sparse warnings related to keypad_read :
warning: incorrect type in argument 1 (different address spaces)
warning: incorrect type in initializer (incompatible argument 2 (different address spaces))

Signed-off-by: Bastien Armand <armand.bastien <at> laposte.net>
---
 drivers/staging/panel/panel.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 08f9a48..1569e26 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
 <at>  <at>  -1571,11 +1571,11  <at>  <at>  static void lcd_init(void)
  */

 static ssize_t keypad_read(struct file *file,
-			   char *buf, size_t count, loff_t *ppos)
+			   char __user *buf, size_t count, loff_t *ppos)
 {

 	unsigned i = *ppos;
-	char *tmp = buf;
+	char __user *tmp = buf;

 	if (keypad_buflen == 0) {
 		if (file->f_flags & O_NONBLOCK)
--
1.7.10.4
(Continue reading)

Bastien Armand | 18 Apr 18:09 2014
Picon

[PATCH v2 0/2] staging: panel: fix sparse warnings.

This serie of two patch fix the following sparse warnings in panel.c :
panel.c:1235:26: warning: incorrect type in argument 1 (different address spaces)
panel.c:1235:26:    expected void const volatile [noderef] <asn:1>*<noident>
panel.c:1235:26:    got char const *tmp
panel.c:1353:20: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
panel.c:1353:20:    expected int ( *write )( ... )
panel.c:1353:20:    got int ( static [toplevel] *<noident> )( ... )
panel.c:1591:17: warning: incorrect type in argument 1 (different address spaces)
panel.c:1591:17:    expected void const volatile [noderef] <asn:1>*<noident>
panel.c:1591:17:    got char *tmp
panel.c:1620:20: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
panel.c:1620:20:    expected int ( *read )( ... )
panel.c:1620:20:    got int ( static [toplevel] *<noident> )( ... )

Changes since v1 :
- splitted patch in two

Bastien Armand (2):
  staging: panel: fix sparse warnings in keypad_read
  staging: panel: fix sparse warnings in lcd_write

 drivers/staging/panel/panel.c |  209 ++++++++++++++++++++++-------------------
 1 file changed, 111 insertions(+), 98 deletions(-)

--
1.7.10.4
Russell King | 18 Apr 11:46 2014
Picon

[PATCH] imx-drm: fix hdmi hotplug detection initial state

The initial state at boot is assumed to be disconnected, and we hope
to receive an interrupt to update the status.  Let's be more explicit
about the current state - reading the PHY status register tells us
the current level of the hotplug signal, which we can report back in
the _detect() method.

Signed-off-by: Russell King <rmk+kernel <at> arm.linux.org.uk>
---
Having discussed the issue of how to detect HDMI with David Airlie last
night, it is perfectly fine to use the HPD signal.  The reason adapters
like Intel i915 use EDID is because of cross-talk on their HPD signals,
which cause them to falsely indicate transitions when nothing has really
changed state.  So, to say that EDID polling is somehow more in keeping
with DRM than using the HPD signal is rather bogus.

The patch below fixes imx-hdmi for good systems where the HPD signal is
wired up at the board level.

 drivers/staging/imx-drm/imx-hdmi.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index d47dedd2cdb4..6f5efcc89880 100644
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
 <at>  <at>  -120,8 +120,6  <at>  <at>  struct imx_hdmi {
 	struct clk *isfr_clk;
 	struct clk *iahb_clk;

-	enum drm_connector_status connector_status;
(Continue reading)

Bastien Armand | 18 Apr 08:01 2014
Picon

[PATCH] staging: panel: fix sparse warnings

This patch fixes sparse warnings in panel.c.

Signed-off-by: Bastien Armand <armand.bastien <at> laposte.net>
---
 drivers/staging/panel/panel.c |  209 ++++++++++++++++++++++-------------------
 1 file changed, 111 insertions(+), 98 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 08f9a48..dc34254 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
 <at>  <at>  -1217,111 +1217,113  <at>  <at>  static inline int handle_lcd_special_code(void)
 	return processed;
 }

+static void lcd_write_char(char c)
+{
+	/* first, we'll test if we're in escape mode */
+	if ((c != '\n') && lcd_escape_len >= 0) {
+		/* yes, let's add this char to the buffer */
+		lcd_escape[lcd_escape_len++] = c;
+		lcd_escape[lcd_escape_len] = 0;
+	} else {
+		/* aborts any previous escape sequence */
+		lcd_escape_len = -1;
+
+		switch (c) {
+		case LCD_ESCAPE_CHAR:
+			/* start of an escape sequence */
+			lcd_escape_len = 0;
(Continue reading)

Daeseok Youn | 18 Apr 02:31 2014
Picon

[PATCH V4] staging: cxt1e1: replace OS_kmalloc/OS_kfree with kzalloc/kfree

Replace OS_kmalloc/OS_kfree with kzalloc/kfree.
And also some allocation doesn't need to use GFP_DMA
so just use GFP_KERNEL.

c4_new() function is never called, remove it.

Signed-off-by: Daeseok Youn <daeseok.youn <at> gmail.com>
---
V4: update patch description, OS_kmalloc should be replaced with
kzalloc for zeroed out the allocated data.
V3: replace kmalloc with kzalloc.
V2: fix subject and comment correctly.

It has some coding style issue. If this patch is merged,
I fix this issue with another patch.

 drivers/staging/cxt1e1/hwprobe.c             |    2 +-
 drivers/staging/cxt1e1/linux.c               |   21 +++++------
 drivers/staging/cxt1e1/musycc.c              |   12 ++++---
 drivers/staging/cxt1e1/pmcc4_drv.c           |   47 +++++---------------------
 drivers/staging/cxt1e1/sbecom_inline_linux.h |   23 +------------
 drivers/staging/cxt1e1/sbecrc.c              |    5 ++-
 drivers/staging/cxt1e1/sbeproc.c             |    2 +-
 7 files changed, 32 insertions(+), 80 deletions(-)

diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index 9b4198b..6e207f5 100644
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
 <at>  <at>  -205,7 +205,7  <at>  <at>  cleanup_devs(void)
(Continue reading)


Gmane