From eca17c52038f974d406768a6f0ab171b9e81a7c8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 30 Aug 2014 16:54:05 -0700 Subject: [PATCH] greybus: uart: tie into gb core properly --- drivers/staging/greybus/uart-gb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c index cdb4a824f253..377ad3846020 100644 --- a/drivers/staging/greybus/uart-gb.c +++ b/drivers/staging/greybus/uart-gb.c @@ -412,7 +412,7 @@ int gb_tty_probe(struct greybus_device *gdev, /* FIXME - allocate gb buffers */ - greybus_set_drvdata(gdev, gb_tty); + gdev->gb_tty = gb_tty; tty_dev = tty_port_register_device(&gb_tty->port, gb_tty_driver, minor, &gdev->dev); @@ -423,14 +423,14 @@ int gb_tty_probe(struct greybus_device *gdev, return 0; error: - greybus_set_drvdata(gdev, NULL); + gdev->gb_tty = NULL; release_minor(gb_tty); return retval; } void gb_tty_disconnect(struct greybus_device *gdev) { - struct gb_tty *gb_tty = greybus_get_drvdata(gdev); + struct gb_tty *gb_tty = gdev->gb_tty; struct tty_struct *tty; if (!gb_tty) @@ -440,7 +440,7 @@ void gb_tty_disconnect(struct greybus_device *gdev) gb_tty->disconnected = true; wake_up_all(&gb_tty->wioctl); - greybus_set_drvdata(gdev, NULL); + gdev->gb_tty = NULL; mutex_unlock(&gb_tty->mutex); tty = tty_port_tty_get(&gb_tty->port); -- 2.20.1