From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabian Frederick Subject: [PATCH 1/1 linux-next] drm/nouveau: don't opencode IS_REACHABLE() Date: Sat, 12 Nov 2016 09:48:18 +0100 Message-ID: <1478940498-2804-1-git-send-email-fabf@skynet.be> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Ben Skeggs Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, fabf@skynet.be List-Id: dri-devel@lists.freedesktop.org Signed-off-by: Fabian Frederick --- drivers/gpu/drm/nouveau/nouveau_hwmon.c | 6 +++--- drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c index 71f764b..ddfac0b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c @@ -37,7 +37,7 @@ #include #include -#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) +#if IS_REACHABLE(CONFIG_HWMON) static ssize_t nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf) { @@ -662,7 +662,7 @@ static const struct attribute_group hwmon_power_attrgroup = { int nouveau_hwmon_init(struct drm_device *dev) { -#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) +#if IS_REACHABLE(CONFIG_HWMON) struct nouveau_drm *drm = nouveau_drm(dev); struct nvkm_therm *therm = nvxx_therm(&drm->device); struct nvkm_volt *volt = nvxx_volt(&drm->device); @@ -749,7 +749,7 @@ nouveau_hwmon_init(struct drm_device *dev) void nouveau_hwmon_fini(struct drm_device *dev) { -#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) +#if IS_REACHABLE(CONFIG_HWMON) struct nouveau_hwmon *hwmon = nouveau_hwmon(dev); if (hwmon->hwmon) { diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h index df2dd08..8de914c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h @@ -1,5 +1,5 @@ #include "priv.h" -#if defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)) +#if IS_REACHABLE(CONFIG_AGP) #ifndef __NVKM_PCI_AGP_H__ #define __NVKM_PCI_AGP_H__ -- 2.7.4