From patchwork Fri Oct 22 12:57:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ionut Nicu X-Patchwork-Id: 274031 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9MD3tVp016409 for ; Fri, 22 Oct 2010 13:03:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756539Ab0JVNDc (ORCPT ); Fri, 22 Oct 2010 09:03:32 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:47295 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756632Ab0JVND1 (ORCPT ); Fri, 22 Oct 2010 09:03:27 -0400 Received: by bwz11 with SMTP id 11so493887bwz.19 for ; Fri, 22 Oct 2010 06:03:26 -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=sGdRfgHz9oN3tkGlRN/JRzkV+cUPiaIXbj7X1imjI68=; b=FsiiDF+Wf1aiiPiLyplq+mIFB/aGKSt3O/4W0phdOjQMOUDF2FH9erUfKNJ5fFtUf9 xHclHyHyEkQkvc/NIgjG2nCQy+tHU9pTKD/tYYY+eJQHtu+7UYvjstH/STMcAZ1dRJWa Oa4hzuA+eMidRN+SfzjU3eg+p+3RyDS1mDW/0= 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=V8RL9tCvPdtCc2+CFNHzsIZvl7B65GfAAdlJiwPB/OrFQ/3E7IHofRkK2hTDGcwlRG Lammt+xejwQ/gNQJYj3LWTP8rSlOsBbSdNDXGpC/nXowmJ1hD+XswHo5ZNyHE7OtNn4N zk+YaN6KaVEhN7+asHDB00VPHHlq2Bvz4SXJQ= Received: by 10.204.76.148 with SMTP id c20mr387765bkk.118.1287752270299; Fri, 22 Oct 2010 05:57:50 -0700 (PDT) Received: from localhost.localdomain ([193.39.73.67]) by mx.google.com with ESMTPS id u4sm2123316bkz.5.2010.10.22.05.57.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 22 Oct 2010 05:57:49 -0700 (PDT) From: Ionut Nicu To: Greg Kroah-Hartman , Omar Ramirez Luna Cc: Fernando Guzman Lugo , Felipe Contreras , linux-omap , Ionut Nicu Subject: [PATCH 2/4] staging: tidspbridge: remove utildefs Date: Fri, 22 Oct 2010 15:57:29 +0300 Message-Id: <1287752251-5847-3-git-send-email-ionut.nicu@mindbit.ro> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1287752251-5847-1-git-send-email-ionut.nicu@mindbit.ro> References: <1287752251-5847-1-git-send-email-ionut.nicu@mindbit.ro> 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 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Oct 2010 13:03:55 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/include/dspbridge/utildefs.h b/drivers/staging/tidspbridge/include/dspbridge/utildefs.h deleted file mode 100644 index 8fe5414..0000000 --- a/drivers/staging/tidspbridge/include/dspbridge/utildefs.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * utildefs.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Global UTIL constants and types, shared between DSP API and DSPSYS. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef UTILDEFS_ -#define UTILDEFS_ - -/* constants taken from configmg.h */ -#define UTIL_MAXMEMREGS 9 -#define UTIL_MAXIOPORTS 20 -#define UTIL_MAXIRQS 7 -#define UTIL_MAXDMACHNLS 7 - -/* misc. constants */ -#define UTIL_MAXARGVS 10 - -/* Platform specific important info */ -struct util_sysinfo { - /* Granularity of page protection; usually 1k or 4k */ - u32 dw_page_size; - u32 dw_allocation_granularity; /* VM granularity, usually 64K */ - u32 dw_number_of_processors; /* Used as sanity check */ -}; - -#endif /* UTILDEFS_ */ diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c index 93a7c4f..8dbdd20 100644 --- a/drivers/staging/tidspbridge/pmgr/cmm.c +++ b/drivers/staging/tidspbridge/pmgr/cmm.c @@ -40,7 +40,6 @@ /* ----------------------------------- OS Adaptation Layer */ #include #include -#include /* ----------------------------------- Platform Manager */ #include @@ -245,7 +244,6 @@ int cmm_create(struct cmm_object **ph_cmm_mgr, { struct cmm_object *cmm_obj = NULL; int status = 0; - struct util_sysinfo sys_info; DBC_REQUIRE(refs > 0); DBC_REQUIRE(ph_cmm_mgr != NULL); @@ -261,12 +259,7 @@ int cmm_create(struct cmm_object **ph_cmm_mgr, DBC_ASSERT(mgr_attrts->ul_min_block_size >= 4); /* save away smallest block allocation for this cmm mgr */ cmm_obj->ul_min_block_size = mgr_attrts->ul_min_block_size; - /* save away the systems memory page size */ - sys_info.dw_page_size = PAGE_SIZE; - sys_info.dw_allocation_granularity = PAGE_SIZE; - sys_info.dw_number_of_processors = 1; - - cmm_obj->dw_page_size = sys_info.dw_page_size; + cmm_obj->dw_page_size = PAGE_SIZE; /* Note: DSP SM seg table(aDSPSMSegTab[]) zero'd by * MEM_ALLOC_OBJECT */