Commit 9f7a104c authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman

staging: dgnc: introduce find_board_by_major()

It was used to get a board structure with dgnc_BoardsByMajor array.
But this driver already has the array for managing initialized board
as dgap_board[]. It can be used for searching the board structure
by major number.
Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1cd7c062
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
/* /*
* internal variables * internal variables
*/ */
static struct dgnc_board *dgnc_BoardsByMajor[256];
static unsigned char *dgnc_TmpWriteBuf; static unsigned char *dgnc_TmpWriteBuf;
/* /*
...@@ -251,8 +250,6 @@ int dgnc_tty_register(struct dgnc_board *brd) ...@@ -251,8 +250,6 @@ int dgnc_tty_register(struct dgnc_board *brd)
goto free_print_driver; goto free_print_driver;
} }
dgnc_BoardsByMajor[brd->serial_driver->major] = brd;
return 0; return 0;
free_print_driver: free_print_driver:
...@@ -388,7 +385,6 @@ void dgnc_cleanup_tty(struct dgnc_board *brd) ...@@ -388,7 +385,6 @@ void dgnc_cleanup_tty(struct dgnc_board *brd)
{ {
int i = 0; int i = 0;
dgnc_BoardsByMajor[brd->serial_driver->major] = NULL;
for (i = 0; i < brd->nasync; i++) { for (i = 0; i < brd->nasync; i++) {
if (brd->channels[i]) if (brd->channels[i])
dgnc_remove_tty_sysfs(brd->channels[i]-> dgnc_remove_tty_sysfs(brd->channels[i]->
...@@ -397,7 +393,6 @@ void dgnc_cleanup_tty(struct dgnc_board *brd) ...@@ -397,7 +393,6 @@ void dgnc_cleanup_tty(struct dgnc_board *brd)
} }
tty_unregister_driver(brd->serial_driver); tty_unregister_driver(brd->serial_driver);
dgnc_BoardsByMajor[brd->print_driver->major] = NULL;
for (i = 0; i < brd->nasync; i++) { for (i = 0; i < brd->nasync; i++) {
if (brd->channels[i]) if (brd->channels[i])
dgnc_remove_tty_sysfs(brd->channels[i]-> dgnc_remove_tty_sysfs(brd->channels[i]->
...@@ -935,6 +930,24 @@ void dgnc_wakeup_writes(struct channel_t *ch) ...@@ -935,6 +930,24 @@ void dgnc_wakeup_writes(struct channel_t *ch)
spin_unlock_irqrestore(&ch->ch_lock, flags); spin_unlock_irqrestore(&ch->ch_lock, flags);
} }
struct dgnc_board *find_board_by_major(unsigned int major)
{
int i;
for (i = 0; i < MAXBOARDS; i++) {
struct dgnc_board *brd = dgnc_board[i];
if (!brd)
return NULL;
if (major == brd->serial_driver->major ||
major == brd->print_driver->major)
return brd;
}
return NULL;
}
/************************************************************************ /************************************************************************
* *
* TTY Entry points and helper functions * TTY Entry points and helper functions
...@@ -964,7 +977,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) ...@@ -964,7 +977,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
return -ENXIO; return -ENXIO;
/* Get board pointer from our array of majors we have allocated */ /* Get board pointer from our array of majors we have allocated */
brd = dgnc_BoardsByMajor[major]; brd = find_board_by_major(major);
if (!brd) if (!brd)
return -ENXIO; return -ENXIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment