From jk@ozlabs.org Thu Apr 13 14:05:31 2006 Return-Path: Received: from imap.linux.ibm.com ([unix socket]) by imap.linux.ibm.com (Cyrus v2.3.1-Invoca-RPM-2.3.1-2.1) with LMTPA; Thu, 13 Apr 2006 08:06:16 -0400 X-Sieve: CMU Sieve 2.3 Received: by imap.linux.ibm.com (Postfix, from userid 101) id D5E1845C031; Thu, 13 Apr 2006 08:06:16 -0400 (EDT) X-Spam-TestScore: none X-Spam-TokenSummary: Bayes not run. X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on imap.linux.ibm.com X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.1.1 X-Spam-Relay-Country: Received: from smtp.linux.ibm.com (smtp.linux.ibm.com [9.26.4.197]) by imap.linux.ibm.com (Postfix) with ESMTP id 450C645C02B for ; Thu, 13 Apr 2006 08:06:13 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.linux.ibm.com (Postfix) with ESMTP id C197B98046 for ; Thu, 13 Apr 2006 08:06:12 -0400 (EDT) Received: from d12nrmr1707.megacenter.de.ibm.com (d12nrmr1707.megacenter.de.ibm.com [9.149.167.81]) by smtp.linux.ibm.com (Postfix) with ESMTP id 1BD389804E for ; Thu, 13 Apr 2006 08:06:11 -0400 (EDT) Received: from d12av03.megacenter.de.ibm.com (d12av03.megacenter.de.ibm.com [9.149.165.213]) by d12nrmr1707.megacenter.de.ibm.com (8.12.10/NCO/VER6.8) with ESMTP id k3DC75dI074216; Thu, 13 Apr 2006 14:07:05 +0200 Received: from d12av03.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av03.megacenter.de.ibm.com (8.12.11/8.13.3) with ESMTP id k3DC6ANn012804; Thu, 13 Apr 2006 14:06:10 +0200 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d12av03.megacenter.de.ibm.com (8.12.11/8.12.11) with ESMTP id k3DC6A4e012780; Thu, 13 Apr 2006 14:06:10 +0200 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.12.10/NCO/VER6.8) with ESMTP id k3DCHWN0097126; Thu, 13 Apr 2006 08:17:32 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k3DC68mm027417; Thu, 13 Apr 2006 08:06:09 -0400 Received: from smtp.linux.ibm.com (ltc-eth1000.torolab.ibm.com [9.26.4.197]) by d01av04.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k3DC68mX027397; Thu, 13 Apr 2006 08:06:08 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.linux.ibm.com (Postfix) with ESMTP id 13B4598046; Thu, 13 Apr 2006 08:06:02 -0400 (EDT) Received: from linux.ibm.com (localhost.localdomain [127.0.0.1]) by smtp.linux.ibm.com (Postfix) with ESMTP id 5064498034; Thu, 13 Apr 2006 08:05:55 -0400 (EDT) X-Original-To: ibm-linux-cell@linux.ibm.com Delivered-To: ibm-linux-cell@linux.ibm.com Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.linux.ibm.com (Postfix) with ESMTP id EC7C398045 for ; Thu, 13 Apr 2006 08:05:52 -0400 (EDT) Received: from sd0109e.au.ibm.com (d23rh905.au.ibm.com [9.190.250.124]) by smtp.linux.ibm.com (Postfix) with ESMTP id 441FD98034 for ; Thu, 13 Apr 2006 08:05:51 -0400 (EDT) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.250.237]) by sd0109e.au.ibm.com (8.12.10/NCO/VER6.8) with ESMTP id k3DC9968117926 for ; Thu, 13 Apr 2006 22:09:09 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.12.11/8.13.3) with ESMTP id k3DC5oQw024904 for ; Thu, 13 Apr 2006 22:05:50 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av04.au.ibm.com (8.12.11/8.12.11) with ESMTP id k3DC5oA5024901 for ; Thu, 13 Apr 2006 22:05:50 +1000 Received: by ozlabs.au.ibm.com (Postfix, from userid 1008) id 7E02F73723; Thu, 13 Apr 2006 22:06:52 +1000 (EST) To: From: Jeremy Kerr Date: Thu, 13 Apr 2006 14:05:31 +0200 Message-Id: <1144929931.437853.545823237202.qpush@pokey> Subject: [ibm-linux-cell] [PATCH] powerpc: cell: Use kzalloc in create_spu X-BeenThere: ibm-linux-cell@linux.ibm.com X-Mailman-Version: 2.1.7 Precedence: list List-Id: Discussion of Linux on Cell kernel development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ibm-linux-cell-bounces@linux.ibm.com Errors-To: ibm-linux-cell-bounces@linux.ibm.com X-Virus-Scanned: amavisd-new at linux.ibm.com X-Length: 6772 X-UID: 1979 Clean up create_spu() a little by using kzalloc instead of kmalloc + assignments. Signed-off-by: Jeremy Kerr --- arch/powerpc/platforms/cell/spu_base.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) Index: linus-2.6/arch/powerpc/platforms/cell/spu_base.c =================================================================== --- linus-2.6.orig/arch/powerpc/platforms/cell/spu_base.c +++ linus-2.6/arch/powerpc/platforms/cell/spu_base.c @@ -673,7 +673,7 @@ static int __init create_spu(struct devi static int number; ret = -ENOMEM; - spu = kmalloc(sizeof (*spu), GFP_KERNEL); + spu = kzalloc(sizeof (*spu), GFP_KERNEL); if (!spu) goto out; @@ -682,27 +682,12 @@ static int __init create_spu(struct devi goto out_free; spu->node = find_spu_node_id(spe); - spu->stop_code = 0; - spu->slb_replace = 0; - spu->mm = NULL; - spu->ctx = NULL; - spu->rq = NULL; - spu->pid = 0; - spu->class_0_pending = 0; - spu->flags = 0UL; - spu->dar = 0UL; - spu->dsisr = 0UL; spin_lock_init(&spu->register_lock); spu_mfc_sdr_set(spu, mfspr(SPRN_SDR1)); spu_mfc_sr1_set(spu, 0x33); spu_smm_pgsz_set(spu, 0x2); - spu->ibox_callback = NULL; - spu->wbox_callback = NULL; - spu->stop_callback = NULL; - spu->mfc_callback = NULL; - down(&spu_mutex); spu->number = number++; ret = spu_request_irqs(spu);