greybus: simple fixes

A few silly little fixes.
    - Clear out some unnecessary #includes in "debugfs.c"
    - Drop some unneeded parentheses in hd_to_es1()
    - Use &hd->hd_priv in hd_to_es1() to emphasize we are working
      with an embedded array, not a pointer
    - Fix a comment in the header for ap_probe()
    - Drop a duplicate #include in "gpio-gb.c"
    - Fix a use-before-set problem in set_serial_info()

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/staging/greybus/debugfs.c b/drivers/staging/greybus/debugfs.c
index 4e313f1a514375aad1999e0d28e9c078b285d547..ef292f43db45cd63c260a110172018ce0a042e7b 100644 (file)
--- a/drivers/staging/greybus/debugfs.c
+++ b/drivers/staging/greybus/debugfs.c
@@ -8,11 +8,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
 #include <linux/debugfs.h>
 
 #include "greybus.h"

diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/es1-ap-usb.c
index 47c4524d6f5ece4df5a5386bb8e10301cc664040..eadbfc80cb2b139ef63e913ea6c1d2fbde7af392 100644 (file)
--- a/drivers/staging/greybus/es1-ap-usb.c
+++ b/drivers/staging/greybus/es1-ap-usb.c
@@ -77,7 +77,7 @@ struct es1_ap_dev {
 
 static inline struct es1_ap_dev *hd_to_es1(struct greybus_host_device *hd)
 {
-       return (struct es1_ap_dev *)(hd->hd_priv);
+       return (struct es1_ap_dev *)&hd->hd_priv;
 }
 
 static void cport_out_callback(struct urb *urb);
@@ -370,7 +370,7 @@ exit:
  * 1 Control - usual USB stuff + AP -> SVC messages
  * 1 Interrupt IN - SVC -> AP messages
  * 1 Bulk IN - CPort data in
- * 1 Bulk OUT - CPorta data out
+ * 1 Bulk OUT - CPort data out
  */
 static int ap_probe(struct usb_interface *interface,
                    const struct usb_device_id *id)

diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio-gb.c
index bcf65087e8e5d293c866d98c982ca43853dccd70..485480dc7233fad39778509c56a5b83bc0e1daea 100644 (file)
--- a/drivers/staging/greybus/gpio-gb.c
+++ b/drivers/staging/greybus/gpio-gb.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
-#include <linux/gpio.h>
 #include "greybus.h"
 
 struct gb_gpio_device {

diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c
index 39a6e0191434287f20896103f637b2399a1981de..75ddd18792ce0e5a7aca10298d7efb0291f3b160 100644 (file)
--- a/drivers/staging/greybus/uart-gb.c
+++ b/drivers/staging/greybus/uart-gb.c
@@ -257,7 +257,7 @@ static int set_serial_info(struct gb_tty *gb_tty,
        struct serial_struct new_serial;
        unsigned int closing_wait;
        unsigned int close_delay;
-       int retval;
+       int retval = 0;
 
        if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
                return -EFAULT;