|
@@ -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,10 +2927,9 @@ 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->ug_info->bdRingLenTx[j],
|
|
|
- GFP_KERNEL);
|
|
|
+ ugeth->tx_skbuff[j] = kmalloc(sizeof(struct sk_buff *) *
|
|
|
+ ugeth->ug_info->bdRingLenTx[j],
|
|
|
+ GFP_KERNEL);
|
|
|
|
|
|
if (ugeth->tx_skbuff[j] == NULL) {
|
|
|
ugeth_err("%s: Could not allocate tx_skbuff",
|
|
@@ -2959,10 +2958,9 @@ 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->ug_info->bdRingLenRx[j],
|
|
|
- GFP_KERNEL);
|
|
|
+ ugeth->rx_skbuff[j] = kmalloc(sizeof(struct sk_buff *) *
|
|
|
+ ugeth->ug_info->bdRingLenRx[j],
|
|
|
+ GFP_KERNEL);
|
|
|
|
|
|
if (ugeth->rx_skbuff[j] == NULL) {
|
|
|
ugeth_err("%s: Could not allocate rx_skbuff",
|
|
@@ -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__);
|