From 69f93abf1181082c7a3dfa24b2ba4a2933ce2c1c Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 22 Sep 2014 18:53:02 -0500 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/debugfs.c | 5 ----- drivers/staging/greybus/es1-ap-usb.c | 4 ++-- drivers/staging/greybus/gpio-gb.c | 1 - drivers/staging/greybus/uart-gb.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/greybus/debugfs.c b/drivers/staging/greybus/debugfs.c index 4e313f1a5143..ef292f43db45 100644 --- a/drivers/staging/greybus/debugfs.c +++ b/drivers/staging/greybus/debugfs.c @@ -8,11 +8,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include -#include -#include -#include -#include #include #include "greybus.h" diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/es1-ap-usb.c index 47c4524d6f5e..eadbfc80cb2b 100644 --- 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 bcf65087e8e5..485480dc7233 100644 --- a/drivers/staging/greybus/gpio-gb.c +++ b/drivers/staging/greybus/gpio-gb.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "greybus.h" struct gb_gpio_device { diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c index 39a6e0191434..75ddd18792ce 100644 --- 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; -- 2.39.2