Date: Fri, 3 Mar 2017 12:03:51 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314593 - in stable/10/sys/dev/drm2: . radeon Message-ID: <201703031203.v23C3pYD055824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Mar 3 12:03:50 2017 New Revision: 314593 URL: https://svnweb.freebsd.org/changeset/base/314593 Log: MFC r288112,r302571: remove unused and redundant declarations and code r288112 Hide an unused in FreeBSD function behind #ifdef linux to get rid of the compile time warning. r302571 Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix -Wredundant-decls warning This allows the code to be compiled with the base gcc. Modified: stable/10/sys/dev/drm2/drm_lock.c stable/10/sys/dev/drm2/radeon/radeon_acpi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/drm_lock.c ============================================================================== --- stable/10/sys/dev/drm2/drm_lock.c Fri Mar 3 11:21:13 2017 (r314592) +++ stable/10/sys/dev/drm2/drm_lock.c Fri Mar 3 12:03:50 2017 (r314593) @@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/drmP.h> +#if defined(__linux__) static int drm_notifier(void *priv); +#endif static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context); @@ -284,6 +286,7 @@ int drm_lock_free(struct drm_lock_data * return 0; } +#if defined(__linux__) /** * If we get here, it means that the process has called DRM_IOCTL_LOCK * without calling DRM_IOCTL_UNLOCK. @@ -314,6 +317,7 @@ static int drm_notifier(void *priv) } while (prev != old); return 0; } +#endif /** * This function returns immediately and takes the hw lock Modified: stable/10/sys/dev/drm2/radeon/radeon_acpi.c ============================================================================== --- stable/10/sys/dev/drm2/radeon/radeon_acpi.c Fri Mar 3 11:21:13 2017 (r314592) +++ stable/10/sys/dev/drm2/radeon/radeon_acpi.c Fri Mar 3 12:03:50 2017 (r314593) @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version; /* version */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703031203.v23C3pYD055824>