Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp489074ybl; Wed, 14 Aug 2019 01:01:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoplQ2SwTmy8xCEbkHMK7VSgpInZY1qV9dh6yRH60QsuacbA3Upq28R+X6zHwe+oouMfj5 X-Received: by 2002:a17:90a:c086:: with SMTP id o6mr6154438pjs.2.1565769704051; Wed, 14 Aug 2019 01:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565769704; cv=none; d=google.com; s=arc-20160816; b=bzCaKv3inAEhDetvPRAWoiEoMVPWurz34+5dccr8cuEYALOwk5b7NSnex4giYl6pBc PclaDOZD4hkg2omMmy7CnfDn6fLOK7EEqOXmakZ6qwsWzrVnA71RJbc3A+/juMNkQT+i hkgt7bAHSUV3UksosZGdtETlhyB74Xiel70y3Rq2KKVLCLfosmorSYF3w3kOQLieSNPP xXHqz2JUP5r49oA7NyuzxeFNuS+9ERl3pcyFezvi68GriMdEqf5VIut9xZb3wx65TQR9 h/UhSFObtPJtbPzKPrPjgb5mUiUndflXMNfeNLMdcPQ8YoD95sGcP4YPMWxlYky0LjEL SiEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x7ybZjKxR0l979mP5Y8wGTwoC7YG2fijyFoop9SwmvY=; b=fQNjx/iSiEorZBh1NBCNo/h/F5P9JlR6JOq1B8BW6Yhrxi8A2vf4m1ELcIYpXx+y2W H617Yrb85Ih4fpG2d5VuiHtLs9SZkQfER2c+onygwHSuGwnhBsEZqMVMGZUsid3vBgEu 4g/rETgaVf5+rZ8IGCY0Zfqo9FuHgwEaUSGKeZew0hTz6VsgV5ZpaMMFEWYDhTg/2mti MzQA4qW2BIgZIMxFRGwQgxj4kr6DoYH917l2JT3YSZggoUxK9tjSVhYqRFZHkqpjbu+G /VZJFhGw+u0DqVGLK51OZALraWaP3kYZMOsf+Wch718V9qs8x8hje4NziHkV7oKMNaMy pgNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=EtVkf6ij; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r33si12242350plb.421.2019.08.14.01.01.28; Wed, 14 Aug 2019 01:01:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=EtVkf6ij; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727507AbfHNH75 (ORCPT + 99 others); Wed, 14 Aug 2019 03:59:57 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:39210 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727411AbfHNH7w (ORCPT ); Wed, 14 Aug 2019 03:59:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=x7ybZjKxR0l979mP5Y8wGTwoC7YG2fijyFoop9SwmvY=; b=EtVkf6ij9YP7jQChetJ8Nqt9QM q8vndfoFkn0oFaOvE44NYuyBJIb10NFiLBxyPkvUL9RdvAA2AqoDMahg34FdlJKmGAn/RNW4lpzci GkLaRLp4yUODlFi84TOG1aV+9vlQ3tCFXHDABhphRHWPGTde6Y/emcLlDw6PpYqnHLJz2+UGYRSZ1 Jon8ItA6WbHmTCZAw2WpcWCu4GVxjSnT1WABW4IFglE9YSqKVIsDuL/uWi9MRUMk9WMsk1SX1M8ci 1smaXvWV1lTMSlE3Q6GvD02aCfSAuv0wLlVsU6Eo/b20Ob1sLJxq2XZDFAgUbzv53iEdQ8EUnZ4vM tChI13kg==; Received: from [2001:4bb8:180:1ec3:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hxoCB-000822-R8; Wed, 14 Aug 2019 07:59:48 +0000 From: Christoph Hellwig To: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: Ralph Campbell , Bharata B Rao , Andrew Morton , linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] nouveau: remove a few function stubs Date: Wed, 14 Aug 2019 09:59:23 +0200 Message-Id: <20190814075928.23766-6-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814075928.23766-1-hch@lst.de> References: <20190814075928.23766-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nouveau_dmem_migrate_vma and nouveau_dmem_convert_pfn are only called when CONFIG_DRM_NOUVEAU_SVM is enabled, so there is no need to provide !CONFIG_DRM_NOUVEAU_SVM stubs for them. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/nouveau/nouveau_dmem.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.h b/drivers/gpu/drm/nouveau/nouveau_dmem.h index 9d97d756fb7d..92394be5d649 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.h +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.h @@ -45,16 +45,5 @@ static inline void nouveau_dmem_init(struct nouveau_drm *drm) {} static inline void nouveau_dmem_fini(struct nouveau_drm *drm) {} static inline void nouveau_dmem_suspend(struct nouveau_drm *drm) {} static inline void nouveau_dmem_resume(struct nouveau_drm *drm) {} - -static inline int nouveau_dmem_migrate_vma(struct nouveau_drm *drm, - struct vm_area_struct *vma, - unsigned long start, - unsigned long end) -{ - return 0; -} - -static inline void nouveau_dmem_convert_pfn(struct nouveau_drm *drm, - struct hmm_range *range) {} #endif /* IS_ENABLED(CONFIG_DRM_NOUVEAU_SVM) */ #endif -- 2.20.1