[Intel-gfx] [PATCH i-g-t] assembler, lib, overlay, tools, tests/: Fix warnings about unused variables.

Marius Vlad marius.c.vlad at intel.com
Wed Sep 7 10:38:55 UTC 2016


Signed-off-by: Marius Vlad <marius.c.vlad at intel.com>
---
 assembler/gen8_disasm.c   |  5 -----
 lib/intel_device_info.c   |  6 ------
 overlay/igfx.c            |  7 -------
 tests/testdisplay.c       |  1 -
 tools/intel_bios_reader.c | 22 ----------------------
 5 files changed, 41 deletions(-)

diff --git a/assembler/gen8_disasm.c b/assembler/gen8_disasm.c
index 7fc7a65..68bc033 100644
--- a/assembler/gen8_disasm.c
+++ b/assembler/gen8_disasm.c
@@ -138,11 +138,6 @@ static const char *const m_dep_ctrl[4] = {
    "NoDDClr,NoDDChk",
 };
 
-static const char *const m_mask_ctrl[4] = {
-   "",
-   "nomask",
-};
-
 static const char *const m_access_mode[2] = { "align1", "align16" };
 
 static const char *const m_reg_type[8] = {
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 5aab684..6a03b09 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -9,12 +9,6 @@ static const struct intel_device_info intel_generic_info = {
 	.gen = 0,
 };
 
-static const struct intel_device_info intel_i81x_info = {
-	.gen = BIT(0),
-	.is_whitney = true,
-	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
-};
-
 static const struct intel_device_info intel_i830_info = {
 	.gen = BIT(1),
 	.is_almador = true,
diff --git a/overlay/igfx.c b/overlay/igfx.c
index fa046e7..55f0edf 100644
--- a/overlay/igfx.c
+++ b/overlay/igfx.c
@@ -35,16 +35,9 @@ static const struct igfx_info generic_info = {
 	.gen = -1,
 };
 
-static const struct igfx_info i81x_info = {
-	.gen = 010,
-};
-
 static const struct igfx_info i830_info = {
 	.gen = 020,
 };
-static const struct igfx_info i845_info = {
-	.gen = 020,
-};
 static const struct igfx_info i855_info = {
 	.gen = 021,
 };
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index a974f42..f2a41fa 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -96,7 +96,6 @@ unsigned int plane_fb_id;
 unsigned int plane_crtc_id;
 unsigned int plane_id;
 int plane_width, plane_height;
-static const uint32_t SPRITE_COLOR_KEY = 0x00aaaaaa;
 
 /*
  * Mode setting with the kernel interfaces is a bit of a chore.
diff --git a/tools/intel_bios_reader.c b/tools/intel_bios_reader.c
index e3daa74..9e8e5ba 100644
--- a/tools/intel_bios_reader.c
+++ b/tools/intel_bios_reader.c
@@ -372,28 +372,6 @@ static const char *efp_port(uint8_t type)
 	return "unknown";
 }
 
-static const struct {
-	unsigned short type;
-	const char *name;
-} efp_conn_info[] = {
-	{ DEVICE_INFO_NONE, "N/A" },
-	{ DEVICE_INFO_HDMI_CERT, "HDMI certified" },
-	{ DEVICE_INFO_DP, "DisplayPort" },
-	{ DEVICE_INFO_DVI, "DVI" },
-};
-static const int num_efp_conn_info = sizeof(efp_conn_info) / sizeof(efp_conn_info[0]);
-
-static const char *efp_conn(uint8_t type)
-{
-	int i;
-
-	for (i = 0; i < num_efp_conn_info; i++)
-		if (efp_conn_info[i].type == type)
-			return efp_conn_info[i].name;
-
-	return "unknown";
-}
-
 static void dump_child_device(struct context *context,
 			      struct child_device_config *child)
 {
-- 
2.8.1



More information about the Intel-gfx mailing list