From patchwork Sun May 2 23:59:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 96391 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4300JL0005691 for ; Mon, 3 May 2010 00:00:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753304Ab0ECAAU (ORCPT ); Sun, 2 May 2010 20:00:20 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:34449 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753111Ab0ECAAS (ORCPT ); Sun, 2 May 2010 20:00:18 -0400 Received: by bwz19 with SMTP id 19so1032682bwz.21 for ; Sun, 02 May 2010 17:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=nJHClVhfzFF3ird2C7XuFV46GYpNnZDtlEMlXGwZI/k=; b=tPSNw/ZOT0tTo1Fx0iov6aIX6dVO2H50bawP5g3mKbA/aIUF984YuwFay38toLOjzV ttFPNPz+S2G0ox/I896CGcxECA5YOgW5fLzS/8EQCtVYhOgcEjy2rcWvdXyIepzjQP/T 8sEL6na+pwDb5aEjeQJzE077F5mma+M6oHrxs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=dxpDsftaTCnOUopTnDXnKgVUW3VSRkMG9CdboxTOc5uEnDPWeOURl/5JNdupe2dY0E 7RucvJUv9Cfh4Cdm2Vg+YfEsb5R8tLBptmM3AaCwUE5JsPbAUqKDn0h5iYXyIMFoGCFb HE+vxAqk1AIWhAXOnk1y8aWYMOFyVkpQtgo6U= Received: by 10.204.162.194 with SMTP id w2mr9047524bkx.160.1272844816754; Sun, 02 May 2010 17:00:16 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 16sm1461458bwz.5.2010.05.02.17.00.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 02 May 2010 17:00:16 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Tony Lindgren , Hiroshi Doyu , Ohad Ben-Cohen , Felipe Contreras Subject: [RFC/PATCH 1/8] omap: mailbox: trivial cleanups Date: Mon, 3 May 2010 02:59:51 +0300 Message-Id: <1272844798-25330-2-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1272844798-25330-1-git-send-email-felipe.contreras@gmail.com> References: <1272844798-25330-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 03 May 2010 00:00:23 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 281ab63..7263b9b 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -93,7 +93,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) mbox_ick_handle = clk_get(NULL, "mailboxes_ick"); if (IS_ERR(mbox_ick_handle)) { - printk(KERN_ERR "Could not get mailboxes_ick: %d\n", + printk(KERN_ERR "Could not get mailboxes_ick: %ld\n", PTR_ERR(mbox_ick_handle)); return PTR_ERR(mbox_ick_handle); } @@ -279,8 +279,6 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .irqdisable = MAILBOX_IRQENABLE(0), }; - - /* OMAP4 specific data structure. Use the cpu_is_omap4xxx() to use this*/ static struct omap_mbox2_priv omap2_mbox_1_priv = { @@ -336,7 +334,6 @@ struct omap_mbox mbox_2_info = { }; EXPORT_SYMBOL(mbox_2_info); - #if defined(CONFIG_ARCH_OMAP2420) /* IVA */ static struct omap_mbox2_priv omap2_mbox_iva_priv = { .tx_fifo = { @@ -419,8 +416,10 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) #endif return 0; +#if defined(CONFIG_ARCH_OMAP2420) /* IVA */ err_iva1: omap_mbox_unregister(&mbox_dsp_info); +#endif err_dsp: iounmap(mbox_base); diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 8d86b0b..822c377 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -82,7 +82,6 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg) return ret; } - int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg) { @@ -108,7 +107,6 @@ static void mbox_tx_tasklet(unsigned long tx_data) struct request_queue *q = mbox->txq->queue; while (1) { - rq = blk_fetch_request(q); if (!rq)