leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: gdm724x: use match_string() helper

Browse Source 
match_string() returns the index of an array for a matching string,
which can be used instead of open coded variant.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Quytelda Kahja <quytelda@tamalin.org>
Cc: devel@driverdev.osuosl.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yisheng Xie 2018-06-06 10:21:11 +08:00 committed by Greg Kroah-Hartman
parent 70ce2440e2
commit e986b667ea
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/gdm724x/gdm_tty.c
View File

@ -33,7 +33,7 @@ static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR]; static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
static DEFINE_MUTEX(gdm_table_lock); static DEFINE_MUTEX(gdm_table_lock);
static char *DRIVER_STRING[TTY_MAX_COUNT] = {"GCTATC", "GCTDM"}; static const char *DRIVER_STRING[TTY_MAX_COUNT] = {"GCTATC", "GCTDM"};
static char *DEVICE_STRING[TTY_MAX_COUNT] = {"GCT-ATC", "GCT-DM"}; static char *DEVICE_STRING[TTY_MAX_COUNT] = {"GCT-ATC", "GCT-DM"};
static void gdm_port_destruct(struct tty_port *port) static void gdm_port_destruct(struct tty_port *port)
@ -55,22 +55,14 @@ static int gdm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
{ {
struct gdm *gdm = NULL; struct gdm *gdm = NULL;
int ret; int ret;
int i;
int j;
j = GDM_TTY_MINOR; ret = match_string(DRIVER_STRING, TTY_MAX_COUNT,
for (i = 0; i < TTY_MAX_COUNT; i++) { tty->driver->driver_name);
if (!strcmp(tty->driver->driver_name, DRIVER_STRING[i])) { if (ret < 0)
j = tty->index;
break;
}
}
if (j == GDM_TTY_MINOR)
return -ENODEV; return -ENODEV;
mutex_lock(&gdm_table_lock); mutex_lock(&gdm_table_lock);
gdm = gdm_table[i][j]; gdm = gdm_table[ret][tty->index];
if (!gdm) { if (!gdm) {
mutex_unlock(&gdm_table_lock); mutex_unlock(&gdm_table_lock);
return -ENODEV; return -ENODEV;