Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07bf39a authored by Lidza Louina's avatar Lidza Louina Committed by Greg Kroah-Hartman
Browse files

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: default avatarLidza Louina <lidza.louina@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8159fd1b

drivers/staging/dgnc/dgnc_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) 


	/* get the board structure and prep it */

	brd = dgnc_Board[dgnc_NumBoards] =

		kzalloc(sizeof(struct dgnc_board), GFP_KERNEL);

		kzalloc(sizeof(*brd), GFP_KERNEL);

	if (!brd) {

		APR(("memory allocation for board structure failed\n"));

		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 */

	brd->msgbuf = brd->msgbuf_head =

		kzalloc(sizeof(char) * 8192, GFP_KERNEL);

		kzalloc(sizeof(u8) * 8192, GFP_KERNEL);

	if (!brd->msgbuf) {

		kfree(brd);

		APR(("memory allocation for board msgbuf failed\n"));

drivers/staging/dgnc/dgnc_mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		uint board = 0;

		uint channel = 0;



		if (copy_from_user(&ni, uarg, sizeof(struct ni_info))) {

		if (copy_from_user(&ni, uarg, sizeof(ni))) {

			return -EFAULT;

		}

drivers/staging/dgnc/dgnc_tty.c

+12 −12
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ int dgnc_tty_register(struct dgnc_board *brd) 


	DPR_INIT(("tty_register start\n"));



	memset(&brd->SerialDriver, 0, sizeof(struct tty_driver));

	memset(&brd->PrintDriver, 0, sizeof(struct tty_driver));

	memset(&brd->SerialDriver, 0, sizeof(brd->SerialDriver));

	memset(&brd->PrintDriver, 0, sizeof(brd->PrintDriver));



	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

	 * 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)

		return -ENOMEM;



	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)

		return -ENOMEM;
@@ -271,11 +271,11 @@ int dgnc_tty_register(struct dgnc_board *brd) 
	 * tty_struct's and termios's.  Must be separated from

	 * 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)

		return -ENOMEM;

	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)

		return -ENOMEM;
@@ -341,7 +341,7 @@ int dgnc_tty_init(struct dgnc_board *brd) 
			 * Okay to malloc with GFP_KERNEL, we are not at

			 * 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]) {

				DPR_CORE(("%s:%d Unable to allocate memory for channel struct\n",

				    __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)

		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"));

		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))

		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)

		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);



		if (copy_to_user(uarg, &buf, sizeof(struct digi_getcounter))) {

		if (copy_to_user(uarg, &buf, sizeof(buf))) {

			return -EFAULT;

		}

		return 0;
@@ -3417,7 +3417,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, 
		/*

		 * 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;

		}
@@ -3463,7 +3463,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, 


		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 0;