UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: dgnc: changes arguments in sizeof 

The arguments that were passed into sizeof were
generic. This patch changes this by putting
the actual item that we need a size of instead.

For example:
-   kzalloc(sizeof(struct dgnc_board), GFP_KERNEL);
+   kzalloc(sizeof(*brd), GFP_KERNEL);

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lidza Louina 2013-10-04 12:18:30 -04:00 committed by Greg Kroah-Hartman
parent 8159fd1be0
commit a07bf39a65
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/dgnc/dgnc_driver.c
View File

@ -487,7 +487,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
/* get the board structure and prep it */ /* get the board structure and prep it */
brd = dgnc_Board[dgnc_NumBoards] = brd = dgnc_Board[dgnc_NumBoards] =
kzalloc(sizeof(struct dgnc_board), GFP_KERNEL); kzalloc(sizeof(*brd), GFP_KERNEL);
if (!brd) { if (!brd) {
APR(("memory allocation for board structure failed\n")); APR(("memory allocation for board structure failed\n"));
return -ENOMEM; return -ENOMEM;
@ -495,7 +495,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
/* make a temporary message buffer for the boot messages */ /* make a temporary message buffer for the boot messages */
brd->msgbuf = brd->msgbuf_head = brd->msgbuf = brd->msgbuf_head =
kzalloc(sizeof(char) * 8192, GFP_KERNEL); kzalloc(sizeof(u8) * 8192, GFP_KERNEL);
if (!brd->msgbuf) { if (!brd->msgbuf) {
kfree(brd); kfree(brd);
APR(("memory allocation for board msgbuf failed\n")); APR(("memory allocation for board msgbuf failed\n"));

2
drivers/staging/dgnc/dgnc_mgmt.c
View File

@ -209,7 +209,7 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
uint board = 0; uint board = 0;
uint channel = 0; uint channel = 0;
if (copy_from_user(&ni, uarg, sizeof(struct ni_info))) { if (copy_from_user(&ni, uarg, sizeof(ni))) {
return -EFAULT; return -EFAULT;
} }

24
drivers/staging/dgnc/dgnc_tty.c
View File

@ -200,8 +200,8 @@ int dgnc_tty_register(struct dgnc_board *brd)
DPR_INIT(("tty_register start\n")); DPR_INIT(("tty_register start\n"));
memset(&brd->SerialDriver, 0, sizeof(struct tty_driver)); memset(&brd->SerialDriver, 0, sizeof(brd->SerialDriver));
memset(&brd->PrintDriver, 0, sizeof(struct tty_driver)); memset(&brd->PrintDriver, 0, sizeof(brd->PrintDriver));
brd->SerialDriver.magic = TTY_DRIVER_MAGIC; brd->SerialDriver.magic = TTY_DRIVER_MAGIC;
@ -222,12 +222,12 @@ int dgnc_tty_register(struct dgnc_board *brd)
* The kernel wants space to store pointers to * The kernel wants space to store pointers to
* tty_struct's and termios's. * tty_struct's and termios's.
*/ */
brd->SerialDriver.ttys = kzalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL); brd->SerialDriver.ttys = kzalloc(brd->maxports * sizeof(*brd->SerialDriver.ttys), GFP_KERNEL);
if (!brd->SerialDriver.ttys) if (!brd->SerialDriver.ttys)
return -ENOMEM; return -ENOMEM;
kref_init(&brd->SerialDriver.kref); kref_init(&brd->SerialDriver.kref);
brd->SerialDriver.termios = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL); brd->SerialDriver.termios = kzalloc(brd->maxports * sizeof(*brd->SerialDriver.termios), GFP_KERNEL);
if (!brd->SerialDriver.termios) if (!brd->SerialDriver.termios)
return -ENOMEM; return -ENOMEM;
@ -271,11 +271,11 @@ int dgnc_tty_register(struct dgnc_board *brd)
* tty_struct's and termios's. Must be separated from * tty_struct's and termios's. Must be separated from
* the Serial Driver so we don't get confused * the Serial Driver so we don't get confused
*/ */
brd->PrintDriver.ttys = kzalloc(brd->maxports * sizeof(struct tty_struct *), GFP_KERNEL); brd->PrintDriver.ttys = kzalloc(brd->maxports * sizeof(*brd->PrintDriver.ttys), GFP_KERNEL);
if (!brd->PrintDriver.ttys) if (!brd->PrintDriver.ttys)
return -ENOMEM; return -ENOMEM;
kref_init(&brd->PrintDriver.kref); kref_init(&brd->PrintDriver.kref);
brd->PrintDriver.termios = kzalloc(brd->maxports * sizeof(struct ktermios *), GFP_KERNEL); brd->PrintDriver.termios = kzalloc(brd->maxports * sizeof(*brd->PrintDriver.termios), GFP_KERNEL);
if (!brd->PrintDriver.termios) if (!brd->PrintDriver.termios)
return -ENOMEM; return -ENOMEM;
@ -341,7 +341,7 @@ int dgnc_tty_init(struct dgnc_board *brd)
* Okay to malloc with GFP_KERNEL, we are not at * Okay to malloc with GFP_KERNEL, we are not at
* interrupt context, and there are no locks held. * interrupt context, and there are no locks held.
*/ */
brd->channels[i] = kzalloc(sizeof(struct channel_t), GFP_KERNEL); brd->channels[i] = kzalloc(sizeof(*brd->channels[i]), GFP_KERNEL);
if (!brd->channels[i]) { if (!brd->channels[i]) {
DPR_CORE(("%s:%d Unable to allocate memory for channel struct\n", DPR_CORE(("%s:%d Unable to allocate memory for channel struct\n",
__FILE__, __LINE__)); __FILE__, __LINE__));
@ -2664,7 +2664,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i
if (!bd || bd->magic != DGNC_BOARD_MAGIC) if (!bd || bd->magic != DGNC_BOARD_MAGIC)
return -EFAULT; return -EFAULT;
if (copy_from_user(&new_digi, new_info, sizeof(struct digi_t))) { if (copy_from_user(&new_digi, new_info, sizeof(new_digi))) {
DPR_IOCTL(("DIGI_SETA failed copy_from_user\n")); DPR_IOCTL(("DIGI_SETA failed copy_from_user\n"));
return -EFAULT; return -EFAULT;
} }
@ -2687,7 +2687,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i
if ((ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE) && !(new_digi.digi_flags & DIGI_DTR_TOGGLE)) if ((ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE) && !(new_digi.digi_flags & DIGI_DTR_TOGGLE))
ch->ch_mostat |= (UART_MCR_DTR); ch->ch_mostat |= (UART_MCR_DTR);
memcpy(&ch->ch_digi, &new_digi, sizeof(struct digi_t)); memcpy(&ch->ch_digi, &new_digi, sizeof(new_digi));
if (ch->ch_digi.digi_maxcps < 1) if (ch->ch_digi.digi_maxcps < 1)
ch->ch_digi.digi_maxcps = 1; ch->ch_digi.digi_maxcps = 1;
@ -3369,7 +3369,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
DGNC_UNLOCK(ch->ch_lock, lock_flags); DGNC_UNLOCK(ch->ch_lock, lock_flags);
if (copy_to_user(uarg, &buf, sizeof(struct digi_getcounter))) { if (copy_to_user(uarg, &buf, sizeof(buf))) {
return -EFAULT; return -EFAULT;
} }
return 0; return 0;
@ -3417,7 +3417,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
/* /*
* Get data from user first. * Get data from user first.
*/ */
if (copy_from_user(&buf, uarg, sizeof(struct digi_getbuffer))) { if (copy_from_user(&buf, uarg, sizeof(buf))) {
return -EFAULT; return -EFAULT;
} }
@ -3463,7 +3463,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
DGNC_UNLOCK(ch->ch_lock, lock_flags); DGNC_UNLOCK(ch->ch_lock, lock_flags);
if (copy_to_user(uarg, &buf, sizeof(struct digi_getbuffer))) { if (copy_to_user(uarg, &buf, sizeof(buf))) {
return -EFAULT; return -EFAULT;
} }
return 0; return 0;