[Bionic][PATCH 2/4] UBUNTU: SAUCE: Revert "xr-usb-serial: Changes to support updates in struct gpio_chip"

[Wen-chien Jesse Sung]

This reverts commit a0b8e0a56c467
UBUNTU: SAUCE: xr-usb-serial: Changes to support updates in struct gpio_chip

Commit a0b8e0a56c467 is tightly coupled with the implementation of Dell
Edge Gateway BIOS and causes issues on other platforms.

BugLink: https://launchpad.net/bugs/1885271
Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 ubuntu/xr-usb-serial/xr_usb_serial_common.c | 11 +++++------
 ubuntu/xr-usb-serial/xr_usb_serial_common.h |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ubuntu/xr-usb-serial/xr_usb_serial_common.c b/ubuntu/xr-usb-serial/xr_usb_serial_common.c
index 2604177298c1d..09d21e63606e0 100644
--- a/ubuntu/xr-usb-serial/xr_usb_serial_common.c
+++ b/ubuntu/xr-usb-serial/xr_usb_serial_common.c
@@ -1215,24 +1215,23 @@ static int xr_usb_serial_write_buffers_alloc(struct xr_usb_serial *xr_usb_serial
 }
 
 #ifdef CONFIG_GPIOLIB
-
 static int xr_usb_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
     struct xr_usb_serial *xr_usb_serial = container_of(chip, struct xr_usb_serial, xr_usb_gpio);
-	dev_dbg(chip->parent, "xr_usb_gpio_get offset = %d channel = %d\n",offset,xr_usb_serial->channel);
+	dev_dbg(chip->dev, "xr_usb_gpio_get offset = %d channel = %d\n",offset,xr_usb_serial->channel);
 	return 0;
 }
 
 static void xr_usb_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 {
    struct xr_usb_serial *xr_usb_serial = container_of(chip, struct xr_usb_serial, xr_usb_gpio);
-   dev_dbg(chip->parent, "xr_usb_gpio_set offset =%d val=%d channel = %d\n",offset,val,xr_usb_serial->channel);
+   dev_dbg(chip->dev, "xr_usb_gpio_set offset =%d val=%d channel = %d\n",offset,val,xr_usb_serial->channel);
 }
 
 static int xr_usb_gpio_direction_input(struct gpio_chip *chip,unsigned offset)
 {
 	struct xr_usb_serial *xr_usb_serial = container_of(chip, struct xr_usb_serial, xr_usb_gpio);
-    dev_dbg(chip->parent, "xr_usb_gpio_direction_input offset =%d channel = %d\n",offset,xr_usb_serial->channel);
+    dev_dbg(chip->dev, "xr_usb_gpio_direction_input offset =%d channel = %d\n",offset,xr_usb_serial->channel);
 	return 0;
 }
 
@@ -1240,7 +1239,7 @@ static int xr_usb_gpio_direction_output(struct gpio_chip *chip,
 					   unsigned offset, int val)
 {
     struct xr_usb_serial *xr_usb_serial = container_of(chip, struct xr_usb_serial, xr_usb_gpio);
-	dev_dbg(chip->parent, "xr_usb_gpio_direction_output offset =%d val=%d channel:%d\n",offset,val,xr_usb_serial->channel);
+	dev_dbg(chip->dev, "xr_usb_gpio_direction_output offset =%d val=%d channel:%d\n",offset,val,xr_usb_serial->channel);
 	return 0;
 }
 #endif
@@ -1677,7 +1676,7 @@ static int xr_usb_serial_probe(struct usb_interface *intf,
 #ifdef CONFIG_GPIOLIB	
    	/* Setup GPIO cotroller */
 	xr_usb_serial->xr_usb_gpio.owner		 = THIS_MODULE;
-	xr_usb_serial->xr_usb_gpio.parent		 = &control_interface->dev;
+	xr_usb_serial->xr_usb_gpio.dev		 = &control_interface->dev;
 	xr_usb_serial->xr_usb_gpio.label		 = dev_name(&control_interface->dev);
 	xr_usb_serial->xr_usb_gpio.direction_input	 = xr_usb_gpio_direction_input;
 	xr_usb_serial->xr_usb_gpio.get		 = xr_usb_gpio_get;
diff --git a/ubuntu/xr-usb-serial/xr_usb_serial_common.h b/ubuntu/xr-usb-serial/xr_usb_serial_common.h
index d462bb5751a4e..97e9024257942 100644
--- a/ubuntu/xr-usb-serial/xr_usb_serial_common.h
+++ b/ubuntu/xr-usb-serial/xr_usb_serial_common.h
@@ -14,7 +14,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <linux/gpio/driver.h>
 /*
  * CMSPAR, some architectures can't have space and mark parity.
  */
-- 
2.25.1