Skip to content

Commit

Permalink
staging: dgnc: driver.c and tty.c: replaces dgnc_driver_kzmalloc with…
Browse files Browse the repository at this point in the history 
… kzalloc

This patch replaces dgnc_driver_kzmalloc with kzalloc.
A patch that follows removes the dgnc_driver_kzmalloc
function.

Signed-off-by: Lidza Louina <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@lydza @gregkh
lydza authored and gregkh committed Aug 28, 2013
1 parent a7a7538 commit 52f9d66
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/dgnc/dgnc_driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,15 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)

/* get the board structure and prep it */
brd = dgnc_Board[dgnc_NumBoards] =
(struct board_t *) dgnc_driver_kzmalloc(sizeof(struct board_t), GFP_KERNEL);
(struct board_t *) kzalloc(sizeof(struct board_t), GFP_KERNEL);
if (!brd) {
APR(("memory allocation for board structure failed\n"));
return(-ENOMEM);
}

/* make a temporary message buffer for the boot messages */
brd->msgbuf = brd->msgbuf_head =
(char *) dgnc_driver_kzmalloc(sizeof(char) * 8192, GFP_KERNEL);
(char *) kzalloc(sizeof(char) * 8192, GFP_KERNEL);
if (!brd->msgbuf) {
kfree(brd);
APR(("memory allocation for board msgbuf failed\n"));
Expand Down Expand Up @@ -721,7 +721,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
* Okay to malloc with GFP_KERNEL, we are not at interrupt
* context, and there are no locks held.
*/
brd->flipbuf = dgnc_driver_kzmalloc(MYFLIPLEN, GFP_KERNEL);
brd->flipbuf = kzalloc(MYFLIPLEN, GFP_KERNEL);

wake_up_interruptible(&brd->state_wait);

Expand Down
20 changes: 10 additions & 10 deletions drivers/staging/dgnc/dgnc_tty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ int dgnc_tty_register(struct board_t *brd)
* The kernel wants space to store pointers to
* tty_struct's and termios's.
*/
brd->SerialDriver.ttys = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL);
brd->SerialDriver.ttys = kzalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL);
if (!brd->SerialDriver.ttys)
return(-ENOMEM);

Expand All @@ -240,12 +240,12 @@ int dgnc_tty_register(struct board_t *brd)
kref_init(&brd->SerialDriver.kref);
#endif

brd->SerialDriver.termios = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
brd->SerialDriver.termios = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
if (!brd->SerialDriver.termios)
return(-ENOMEM);

#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
brd->SerialDriver.termios_locked = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
brd->SerialDriver.termios_locked = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
if (!brd->SerialDriver.termios_locked)
return(-ENOMEM);
#endif
Expand Down Expand Up @@ -289,7 +289,7 @@ int dgnc_tty_register(struct board_t *brd)
* tty_struct's and termios's. Must be seperate from
* the Serial Driver so we don't get confused
*/
brd->PrintDriver.ttys = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL);
brd->PrintDriver.ttys = kzalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL);
if (!brd->PrintDriver.ttys)
return(-ENOMEM);

Expand All @@ -299,12 +299,12 @@ int dgnc_tty_register(struct board_t *brd)
kref_init(&brd->PrintDriver.kref);
#endif

brd->PrintDriver.termios = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
brd->PrintDriver.termios = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
if (!brd->PrintDriver.termios)
return(-ENOMEM);

#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
brd->PrintDriver.termios_locked = dgnc_driver_kzmalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
brd->PrintDriver.termios_locked = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL);
if (!brd->PrintDriver.termios_locked)
return(-ENOMEM);
#endif
Expand Down Expand Up @@ -371,7 +371,7 @@ int dgnc_tty_init(struct board_t *brd)
* Okay to malloc with GFP_KERNEL, we are not at
* interrupt context, and there are no locks held.
*/
brd->channels[i] = dgnc_driver_kzmalloc(sizeof(struct channel_t), GFP_KERNEL);
brd->channels[i] = kzalloc(sizeof(struct channel_t), GFP_KERNEL);
if (!brd->channels[i]) {
DPR_CORE(("%s:%d Unable to allocate memory for channel struct\n",
__FILE__, __LINE__));
Expand Down Expand Up @@ -1392,11 +1392,11 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
DGNC_UNLOCK(ch->ch_lock, lock_flags);

if (!ch->ch_rqueue)
ch->ch_rqueue = dgnc_driver_kzmalloc(RQUEUESIZE, GFP_KERNEL);
ch->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
if (!ch->ch_equeue)
ch->ch_equeue = dgnc_driver_kzmalloc(EQUEUESIZE, GFP_KERNEL);
ch->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
if (!ch->ch_wqueue)
ch->ch_wqueue = dgnc_driver_kzmalloc(WQUEUESIZE, GFP_KERNEL);
ch->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL);

DGNC_LOCK(ch->ch_lock, lock_flags);

Expand Down

0 comments on commit 52f9d66

Please sign in to comment.