From patchwork Thu Mar 5 10:42:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 5944741 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C34329F380 for ; Thu, 5 Mar 2015 10:45:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AD7720382 for ; Thu, 5 Mar 2015 10:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0D442034C for ; Thu, 5 Mar 2015 10:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751009AbbCEKp2 (ORCPT ); Thu, 5 Mar 2015 05:45:28 -0500 Received: from down.free-electrons.com ([37.187.137.238]:56380 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754564AbbCEKp1 (ORCPT ); Thu, 5 Mar 2015 05:45:27 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 436283B4; Thu, 5 Mar 2015 11:45:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 76AE83AA; Thu, 5 Mar 2015 11:45:05 +0100 (CET) From: Maxime Ripard To: Vinod Koul Cc: dmaengine@vger.kernel.org, Maxime Ripard Subject: [PATCH] dmaengine: Remove net_dma leftovers Date: Thu, 5 Mar 2015 11:42:43 +0100 Message-Id: <1425552163-18326-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.3.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 7bce d397 510a ("net_dma: simple removal") removed the net_dma support entirely but left some functions and prototypes in the dmaengine header. Remove them. Signed-off-by: Maxime Ripard --- include/linux/dmaengine.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b6997a0cb528..dfc5c3af0438 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1116,27 +1116,4 @@ static inline struct dma_chan return __dma_request_channel(mask, fn, fn_param); } - -/* --- Helper iov-locking functions --- */ - -struct dma_page_list { - char __user *base_address; - int nr_pages; - struct page **pages; -}; - -struct dma_pinned_list { - int nr_iovecs; - struct dma_page_list page_list[0]; -}; - -struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len); -void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list); - -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov, - struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len); -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov, - struct dma_pinned_list *pinned_list, struct page *page, - unsigned int offset, size_t len); - #endif /* DMAENGINE_H */