From patchwork Thu May 13 17:47:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99358 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 o4DHmX4h011832 for ; Thu, 13 May 2010 17:48:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758201Ab0EMRsc (ORCPT ); Thu, 13 May 2010 13:48:32 -0400 Received: from fg-out-1718.google.com ([72.14.220.155]:64611 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753870Ab0EMRsb (ORCPT ); Thu, 13 May 2010 13:48:31 -0400 Received: by fg-out-1718.google.com with SMTP id d23so1239991fga.1 for ; Thu, 13 May 2010 10:48:30 -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=EYdy8rHCi2f5RZljqg+PWeS0pFlyrjv5EsYISwtjiEg=; b=JTmtU4euOf/h3a/S/WDzRWYWTDS1QdxnerSOgkGggslQfAYNfkf2t0cQCgp6y2ZMJO lHMo74SNxMxxmP133kyE1lms+0iSc9nUnvMG7DIlRSb0+Z4Ucn7BT63Zq5GlLKr84Epb ORKfrrO3AaLr2Pnrp1bJsLSQ3ZG2k0bjxM9js= 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=t7pJ3DJXGj7j893KmayQ7s4u4djv0KqyVOtZ4WS+MH/EBAxPib1vKA0nr70QQmSdxc jc3DQDl+OWIV7bU4TmbC44fd8+Ha64vFlmaeGCzcSJblFAuRGKfokWEQX9OON4nJkUe3 Rc0r++1IWL/22OfAXnzxN7eixhwHtjiTJCHo4= Received: by 10.87.74.32 with SMTP id b32mr1060423fgl.46.1273772910444; Thu, 13 May 2010 10:48:30 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d6sm4261358fga.23.2010.05.13.10.48.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 13 May 2010 10:48:30 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Russell King , Felipe Contreras Subject: [PATCH 05/15] omap: mailbox: update omap1 probing Date: Thu, 13 May 2010 20:47:26 +0300 Message-Id: <1273772856-10881-6-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273772856-10881-1-git-send-email-felipe.contreras@gmail.com> References: <1273772856-10881-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]); Thu, 13 May 2010 17:48:33 +0000 (UTC) diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index f3266dd..9667f2f 100644 --- a/arch/arm/mach-omap1/mailbox.c +++ b/arch/arm/mach-omap1/mailbox.c @@ -146,12 +146,7 @@ EXPORT_SYMBOL(mbox_dsp_info); static int __devinit omap1_mbox_probe(struct platform_device *pdev) { struct resource *res; - - if (pdev->num_resources != 2) { - dev_err(&pdev->dev, "invalid number of resources: %d\n", - pdev->num_resources); - return -ENODEV; - } + int ret; /* MBOX base */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -159,23 +154,33 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev) dev_err(&pdev->dev, "invalid mem resource\n"); return -ENODEV; } - mbox_base = OMAP1_IO_ADDRESS(res->start); + mbox_base = ioremap(res->start, resource_size(res)); + if (!mbox_base) + return -ENOMEM; /* DSP IRQ */ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (unlikely(!res)) { dev_err(&pdev->dev, "invalid irq resource\n"); - return -ENODEV; + ret = -ENODEV; + goto err_out; } mbox_dsp_info.irq = res->start; - return omap_mbox_register(&pdev->dev, &mbox_dsp_info); + ret = omap_mbox_register(&pdev->dev, &mbox_dsp_info); + if (ret) + goto err_out; + return 0; + +err_out: + iounmap(mbox_base); + return ret; } static int __devexit omap1_mbox_remove(struct platform_device *pdev) { omap_mbox_unregister(&mbox_dsp_info); - + iounmap(mbox_base); return 0; }