From owner-svn-src-stable-10@freebsd.org Fri Mar 3 12:03:52 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77430CF7BC8; Fri, 3 Mar 2017 12:03:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29F6E1141; Fri, 3 Mar 2017 12:03:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23C3pn0055826; Fri, 3 Mar 2017 12:03:51 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23C3pYD055824; Fri, 3 Mar 2017 12:03:51 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703031203.v23C3pYD055824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 3 Mar 2017 12:03:51 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 12:03:52 -0000 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 +#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 */