amdgpu/dc: use kernel ilog2 for log_2.

index a2e22ae..23c9a0e 100644
@@ -102,13 +102,3 @@ void convert_float_matrix(
 		matrix[i] = (uint16_t)reg_value;
 	}
 }
-
-unsigned int log_2(unsigned int num)
-{
-	unsigned int result = 0;
-
-	while ((num >>= 1) != 0)
-		result++;
-
-	return result;
-}

index 189325f..ade785c 100644
@@ -38,6 +38,9 @@ void convert_float_matrix(
 	struct fixed31_32 *flt,
 	uint32_t buffer_size);
 
-unsigned int log_2(unsigned int num);
+static inline unsigned int log_2(unsigned int num)
+{
+	return ilog2(num);
+}
 
 #endif

deleted file mode 100644
index 55f5238..0000000
@@ -1,30 +0,0 @@
-/* Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef _DCE110_TYPES_H_
-#define __DCE110_TYPES_H_
-
-#define GAMMA_SEGMENTS_NUM 16
-
-#endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_DCE110_DCE110_TYPES_H_ */

index bd8d0ab..82737de 100644
@@ -28,7 +28,6 @@
 
 #include "timing_generator.h"
 #include "../include/grph_object_id.h"
-#include "../include/hw_sequencer_types.h"
 
 /* GSL Sync related values */
 

index d69871e..549d70b 100644
@@ -28,7 +28,6 @@
 
 #include "timing_generator.h"
 #include "../include/grph_object_id.h"
-#include "../include/hw_sequencer_types.h"
 #include "dce110/dce110_timing_generator.h"
 
 

index d786ec4..ff23f26 100644
@@ -46,7 +46,6 @@ void enable_surface_flip_reporting(struct dc_plane_state *plane_state,
 #include "stream_encoder.h"
 #include "clock_source.h"
 #include "audio.h"
-#include "hw_sequencer_types.h"
 #include "dm_pp_smu.h"
 
 

index 6ff90a0f..3050afe 100644
@@ -6,7 +6,6 @@
 #ifndef STREAM_ENCODER_H_
 #define STREAM_ENCODER_H_
 
-#include "include/hw_sequencer_types.h"
 #include "audio_types.h"
 
 struct dc_bios;

deleted file mode 100644
index 8ba9f65..0000000
@@ -1,33 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DAL_HW_SEQUENCER_TYPES_H__
-#define __DAL_HW_SEQUENCER_TYPES_H__
-
-#include "signal_types.h"
-#include "grph_object_defs.h"
-#include "link_service_types.h"
-
-#endif

index d4e5ef6..95df7d4 100644
@@ -56,8 +56,7 @@ struct gpio_service *dal_gpio_service_create(
 	struct dc_context *ctx)
 {
 	struct gpio_service *service;
-
-	uint32_t index_of_id;
+	int i;
 
 	service = kzalloc(sizeof(struct gpio_service), GFP_KERNEL);
 

@@ -78,62 +77,16 @@ struct gpio_service *dal_gpio_service_create(
 		goto failure_1;
 	}
 
-	/* allocate and initialize business storage */
-	{
-		const uint32_t bits_per_uint = sizeof(uint32_t) << 3;
-
-		index_of_id = 0;
-		service->ctx = ctx;
-
-		do {
-			uint32_t number_of_bits =
-				service->factory.number_of_pins[index_of_id];
-
-			uint32_t number_of_uints =
-				(number_of_bits + bits_per_uint - 1) /
-				bits_per_uint;
-
-			uint32_t *slot;
-
-			if (number_of_bits) {
-				uint32_t index_of_uint = 0;
+	service->ctx = ctx;
 
-				slot = kzalloc(number_of_uints * sizeof(uint32_t),
-					       GFP_KERNEL);
-
-				if (!slot) {
-					BREAK_TO_DEBUGGER();
-					goto failure_2;
-				}
-
-				do {
-					slot[index_of_uint] = 0;
-
-					++index_of_uint;
-				} while (index_of_uint < number_of_uints);
-			} else
-				slot = NULL;
-
-			service->busyness[index_of_id] = slot;
-
-			++index_of_id;
-		} while (index_of_id < GPIO_ID_COUNT);
+	for (i = 0; i < GPIO_ID_COUNT; i++) {
+		if (service->factory.number_of_pins[i] > 32) {
+			BREAK_TO_DEBUGGER();
+			goto failure_1;
+		}
 	}
-
 	return service;
 
-failure_2:
-	while (index_of_id) {
-		uint32_t *slot;
-
-		--index_of_id;
-
-		slot = service->busyness[index_of_id];
-
-		if (slot)
-			kfree(slot);
-	};
-
 failure_1:
 	kfree(service);
 

@@ -164,20 +117,6 @@ void dal_gpio_service_destroy(
 		return;
 	}
 
-	/* free business storage */
-	{
-		uint32_t index_of_id = 0;
-
-		do {
-			uint32_t *slot = (*ptr)->busyness[index_of_id];
-
-			if (slot)
-				kfree(slot);
-
-			++index_of_id;
-		} while (index_of_id < GPIO_ID_COUNT);
-	}
-
 	kfree(*ptr);
 
 	*ptr = NULL;

@@ -195,9 +134,7 @@ static bool is_pin_busy(
 {
 	const uint32_t bits_per_uint = sizeof(uint32_t) << 3;
 
-	const uint32_t *slot = service->busyness[id] + (en / bits_per_uint);
-
-	return 0 != (*slot & (1 << (en % bits_per_uint)));
+	return 0 != (service->busyness[id] & (1 << (en % bits_per_uint)));
 }
 
 static void set_pin_busy(

@@ -207,8 +144,7 @@ static void set_pin_busy(
 {
 	const uint32_t bits_per_uint = sizeof(uint32_t) << 3;
 
-	service->busyness[id][en / bits_per_uint] |=
-		(1 << (en % bits_per_uint));
+	service->busyness[id] |= (1 << (en % bits_per_uint));
 }
 
 static void set_pin_free(

@@ -218,8 +154,7 @@ static void set_pin_free(
 {
 	const uint32_t bits_per_uint = sizeof(uint32_t) << 3;
 
-	service->busyness[id][en / bits_per_uint] &=
-		~(1 << (en % bits_per_uint));
+	service->busyness[id] &= ~(1 << (en % bits_per_uint));
 }
 
 enum gpio_result dal_gpio_service_open(

index c7f3081..96c52be 100644
@@ -33,13 +33,7 @@ struct gpio_service {
 	struct dc_context *ctx;
 	struct hw_translate translate;
 	struct hw_factory factory;
-	/*
-	 * @brief
-	 * Business storage.
-	 * For each member of 'enum gpio_id',
-	 * store array of bits (packed into uint32_t slots),
-	 * index individual bit by 'en' value */
-	uint32_t *busyness[GPIO_ID_COUNT];
+	uint32_t busyness[GPIO_ID_COUNT];
 };
 
 enum gpio_result dal_gpio_service_open(