From patchwork Tue Sep 8 04:26:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 33112 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id CBA46B70CF for ; Tue, 8 Sep 2009 14:37:01 +1000 (EST) Received: by ozlabs.org (Postfix) id C1259DDD0B; Tue, 8 Sep 2009 14:37:01 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 538BCDDD01 for ; Tue, 8 Sep 2009 14:37:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753193AbZIHEgn (ORCPT ); Tue, 8 Sep 2009 00:36:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753190AbZIHEgn (ORCPT ); Tue, 8 Sep 2009 00:36:43 -0400 Received: from [186.40.58.177] ([186.40.58.177]:60294 "EHLO localhost.localdomain" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752335AbZIHEgm (ORCPT ); Tue, 8 Sep 2009 00:36:42 -0400 X-Greylist: delayed 571 seconds by postgrey-1.27 at vger.kernel.org; Tue, 08 Sep 2009 00:36:40 EDT Received: from localhost.localdomain (dbueso-pc [127.0.0.1]) by localhost.localdomain (8.14.3/8.14.3/Debian-6) with ESMTP id n884QxMB017599; Tue, 8 Sep 2009 00:27:00 -0400 Received: (from dave@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id n884QtaR017587; Tue, 8 Sep 2009 00:26:55 -0400 X-Authentication-Warning: localhost.localdomain: dave set sender to dave@gnu.org using -f Subject: [PATCH resend] s2io: Remove unnecessary casts From: Davidlohr Bueso Reply-To: dave@gnu.org To: davem@davemloft.net Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Date: Tue, 08 Sep 2009 00:26:55 -0400 Message-Id: <1252384015.6396.11.camel@dbueso-pc> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, Don't know why my email client corrupted the patch, anyways, here it is without white spaces. No need to cast kmalloc. Thanks, Davidlohr Signed-off-by: Davidlohr Bueso --- drivers/net/s2io.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 458daa0..2bc62d3 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -870,8 +870,10 @@ static int init_shared_mem(struct s2io_nic *nic) while (k != rxd_count[nic->rxd_mode]) { ba = &mac_control->rings[i].ba[j][k]; - ba->ba_0_org = (void *) kmalloc - (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); + ba->ba_0_org = kmalloc + (BUF0_LEN + ALIGN_SIZE, + GFP_KERNEL); + if (!ba->ba_0_org) return -ENOMEM; mem_allocated += @@ -881,9 +883,10 @@ static int init_shared_mem(struct s2io_nic *nic) tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_0 = (void *) tmp; - ba->ba_1_org = (void *) kmalloc - (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); + ba->ba_1_org = kmalloc + (BUF1_LEN + ALIGN_SIZE, + GFP_KERNEL); + if (!ba->ba_1_org) return -ENOMEM; mem_allocated --