From 543b8ed2fee047ae8f598a0c8b763aff59139044 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 Sep 2014 17:02:47 -0700 Subject: [PATCH] greybus: uart-gb: let the core dynamically allocate the major number Don't register the tty_gb_driver, the gb core is not ready for the for ES1 devices. --- drivers/staging/greybus/uart-gb.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c index 5c01b0a..39a6e01 100644 --- a/drivers/staging/greybus/uart-gb.c +++ b/drivers/staging/greybus/uart-gb.c @@ -28,7 +28,6 @@ #include #include "greybus.h" -#define GB_TTY_MAJOR 230 /* FIXME use a real number!!! */ #define GB_NUM_MINORS 255 /* 255 is enough for anyone... */ #define GB_NAME "ttyGB" @@ -462,27 +461,17 @@ void gb_tty_disconnect(struct greybus_device *gdev) kfree(gb_tty); } +#if 0 static struct greybus_driver tty_gb_driver = { .probe = gb_tty_probe, .disconnect = gb_tty_disconnect, .id_table = id_table, }; - +#endif int __init gb_tty_init(void) { int retval = 0; - dev_t dev; - -#if 0 - - retval = alloc_chrdev_region(&dev, 0, GB_NUM_MINORS, GB_NAME); - if (retval) { - pr_err("Can not allocate minors\n"); - return retval; - } -#endif - gb_tty_driver = tty_alloc_driver(GB_NUM_MINORS, 0); if (IS_ERR(gb_tty_driver)) { @@ -518,12 +507,11 @@ int __init gb_tty_init(void) return 0; - fail_unregister_gb_tty: +/* fail_unregister_gb_tty: */ tty_unregister_driver(gb_tty_driver); - fail_put_gb_tty: +fail_put_gb_tty: put_tty_driver(gb_tty_driver); - fail_unregister_dev: -// unregister_chrdev_region(dev, GB_NUM_MINORS); +fail_unregister_dev: return retval; } @@ -531,7 +519,10 @@ void __exit gb_tty_exit(void) { int major = MAJOR(gb_tty_driver->major); int minor = gb_tty_driver->minor_start; -// greybus_deregister(&tty_gb_driver); + +#if 0 + greybus_deregister(&tty_gb_driver); +#endif tty_unregister_driver(gb_tty_driver); put_tty_driver(gb_tty_driver); unregister_chrdev_region(MKDEV(major, minor), GB_NUM_MINORS); -- 2.7.4