From patchwork Sat Dec 14 03:26:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22465 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BDB2324006 for ; Sat, 14 Dec 2013 03:26:48 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ld13sf4775744vcb.9 for ; Fri, 13 Dec 2013 19:26:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=eEjcBh7Sil+D9irV3/BzczxLiSYUL+m4mqaqOkc8yJM=; b=VKamXL1qSSXJ287JImJElDmdVaDlVUeFLtlluKMtwIULCsTm9JpFnWJAjYNkR1IJdu eOfqqjDh291gVE66ehoFi5Me2YvLujISbanj5+KY5sQFNSWxIJecUauh4QlrOrZg9E4H xwMOGEZcYmZHH9r5qM1Zr6XZYXLfAJZ6lZfWhk+1ml4Om9Oj6WqIelejEqqhprFHfNSP cT1EGdoovlYgnVI9g12o7lclMYnIfZD7HIXbZMIwsXv9AJ9Ll51MkNrg3xzizbM4Ch5A uoUmfRPdrai5QGPTr5pxMuKO8+EaSJSnjAaq2zPboRuTau6tTaNMFY7hTt5ZWf6A/HeT ZMlA== X-Gm-Message-State: ALoCoQlya9cYJvX7juX1WfsK2ah73T2+fjtjd/YZXNonktAQfDop5doqQF2qS1QdZTaP8ccqv6JF X-Received: by 10.58.237.102 with SMTP id vb6mr2296495vec.31.1386991608616; Fri, 13 Dec 2013 19:26:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.81 with SMTP id da17ls1332632qeb.22.gmail; Fri, 13 Dec 2013 19:26:48 -0800 (PST) X-Received: by 10.58.217.169 with SMTP id oz9mr2554005vec.42.1386991608494; Fri, 13 Dec 2013 19:26:48 -0800 (PST) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id wv16si1420706vcb.122.2013.12.13.19.26.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:26:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id lc6so1843398vcb.41 for ; Fri, 13 Dec 2013 19:26:48 -0800 (PST) X-Received: by 10.58.187.81 with SMTP id fq17mr2643208vec.14.1386991608399; Fri, 13 Dec 2013 19:26:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp86925vcz; Fri, 13 Dec 2013 19:26:48 -0800 (PST) X-Received: by 10.68.203.34 with SMTP id kn2mr7176280pbc.82.1386991607712; Fri, 13 Dec 2013 19:26:47 -0800 (PST) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx.google.com with ESMTPS id g5si2970486pav.143.2013.12.13.19.26.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:26:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.54 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.54; Received: by mail-pb0-f54.google.com with SMTP id un15so3335773pbc.41 for ; Fri, 13 Dec 2013 19:26:47 -0800 (PST) X-Received: by 10.68.110.132 with SMTP id ia4mr6969001pbb.99.1386991607316; Fri, 13 Dec 2013 19:26:47 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id nw11sm11680086pab.13.2013.12.13.19.26.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:26:46 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , John Stultz Subject: [PATCH 095/115] gpu: ion: remove unnecessary function from system heap Date: Fri, 13 Dec 2013 19:26:15 -0800 Message-Id: <1386991595-6251-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386991595-6251-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> <1386991595-6251-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Colin Cross ion_system_contig_heap buffers have an sglist, just call ion_heap_map_user to map it. Signed-off-by: Colin Cross Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_system_heap.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 3b2f420..9250ee5 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -422,17 +422,6 @@ void ion_system_contig_heap_unmap_dma(struct ion_heap *heap, kfree(buffer->sg_table); } -int ion_system_contig_heap_map_user(struct ion_heap *heap, - struct ion_buffer *buffer, - struct vm_area_struct *vma) -{ - unsigned long pfn = page_to_pfn(virt_to_page(buffer->priv_virt)); - return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff, - vma->vm_end - vma->vm_start, - vma->vm_page_prot); - -} - static struct ion_heap_ops kmalloc_ops = { .allocate = ion_system_contig_heap_allocate, .free = ion_system_contig_heap_free, @@ -441,7 +430,7 @@ static struct ion_heap_ops kmalloc_ops = { .unmap_dma = ion_system_contig_heap_unmap_dma, .map_kernel = ion_heap_map_kernel, .unmap_kernel = ion_heap_unmap_kernel, - .map_user = ion_system_contig_heap_map_user, + .map_user = ion_heap_map_user, }; struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *unused)