Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751442AbbEGIuE (ORCPT ); Thu, 7 May 2015 04:50:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55374 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971AbbEGIuA (ORCPT ); Thu, 7 May 2015 04:50:00 -0400 From: Denys Vlasenko To: Ben Skeggs Cc: Denys Vlasenko , Stefan Huehner , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau/core: deinline nv_mask() Date: Thu, 7 May 2015 10:49:49 +0200 Message-Id: <1430988589-9486-1-git-send-email-dvlasenk@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2103 Lines: 65 Function compiles to 89 bytes of machine code. 466 callsites with this .config: http://busybox.net/~vda/kernel_config Size reduction: text data bss dec hex filename 82432426 22255384 20627456 125315266 77828c2 vmlinux.before 82426986 22255416 20627456 125309858 77813a2 vmlinux Signed-off-by: Denys Vlasenko CC: Stefan Huehner CC: Ben Skeggs CC: David Airlie CC: dri-devel@lists.freedesktop.org CC: linux-kernel@vger.kernel.org --- drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 9 ++------- drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 8 ++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h index 6fdc391..261b7ff 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h @@ -109,11 +109,6 @@ nv_wr32(void *obj, u32 addr, u32 data) iowrite32_native(data, subdev->mmio + addr); } -static inline u32 -nv_mask(void *obj, u32 addr, u32 mask, u32 data) -{ - u32 temp = nv_rd32(obj, addr); - nv_wr32(obj, addr, (temp & ~mask) | data); - return temp; -} +u32 +nv_mask(void *obj, u32 addr, u32 mask, u32 data); #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c index c5fb3a79..88331ea 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c @@ -25,6 +25,14 @@ #include #include +u32 +nv_mask(void *obj, u32 addr, u32 mask, u32 data) +{ + u32 temp = nv_rd32(obj, addr); + nv_wr32(obj, addr, (temp & ~mask) | data); + return temp; +} + struct nvkm_subdev * nvkm_subdev(void *obj, int idx) { -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/