Commit 04b588d7 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Jeff Garzik
Browse files

UCC Ether driver: kmalloc casting cleanups 



A kmalloc casting cleanup patch.

Signed-off-by: default avatarAhmed Darwish <darwish.07@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7f60c64b

drivers/net/ucc_geth.c

+10 −13
Original line number Diff line number Diff line
@@ -2865,8 +2865,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) 
			if (UCC_GETH_TX_BD_RING_ALIGNMENT > 4)

				align = UCC_GETH_TX_BD_RING_ALIGNMENT;

			ugeth->tx_bd_ring_offset[j] =

				(u32) (kmalloc((u32) (length + align),

				GFP_KERNEL));

				kmalloc((u32) (length + align), GFP_KERNEL);



			if (ugeth->tx_bd_ring_offset[j] != 0)

				ugeth->p_tx_bd_ring[j] =

					(void*)((ugeth->tx_bd_ring_offset[j] +
@@ -2901,7 +2901,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) 
			if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4)

				align = UCC_GETH_RX_BD_RING_ALIGNMENT;

			ugeth->rx_bd_ring_offset[j] =

			    (u32) (kmalloc((u32) (length + align), GFP_KERNEL));

				kmalloc((u32) (length + align), GFP_KERNEL);

			if (ugeth->rx_bd_ring_offset[j] != 0)

				ugeth->p_rx_bd_ring[j] =

					(void*)((ugeth->rx_bd_ring_offset[j] +
@@ -2927,8 +2927,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) 
	/* Init Tx bds */

	for (j = 0; j < ug_info->numQueuesTx; j++) {

		/* Setup the skbuff rings */

		ugeth->tx_skbuff[j] =

		    (struct sk_buff **)kmalloc(sizeof(struct sk_buff *) *

		ugeth->tx_skbuff[j] = kmalloc(sizeof(struct sk_buff *) *

					      ugeth->ug_info->bdRingLenTx[j],

					      GFP_KERNEL);
@@ -2959,8 +2958,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) 
	/* Init Rx bds */

	for (j = 0; j < ug_info->numQueuesRx; j++) {

		/* Setup the skbuff rings */

		ugeth->rx_skbuff[j] =

		    (struct sk_buff **)kmalloc(sizeof(struct sk_buff *) *

		ugeth->rx_skbuff[j] = kmalloc(sizeof(struct sk_buff *) *

					      ugeth->ug_info->bdRingLenRx[j],

					      GFP_KERNEL);
@@ -3453,8 +3451,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) 
	 * allocated resources can be released when the channel is freed.

	 */

	if (!(ugeth->p_init_enet_param_shadow =

	     (struct ucc_geth_init_pram *) kmalloc(sizeof(struct ucc_geth_init_pram),

					      GFP_KERNEL))) {

	      kmalloc(sizeof(struct ucc_geth_init_pram), GFP_KERNEL))) {

		ugeth_err

		    ("%s: Can not allocate memory for"

			" p_UccInitEnetParamShadows.", __FUNCTION__);