From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 29 Jul 2013 21:03:46 +0000 (-0700)
Subject: staging: comedi: das16: remove 'i8254_offset' from boardinfo
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=22cfc772f5e55341708ac31881df69e233787b8a;p=deliverable%2Flinux.git

staging: comedi: das16: remove 'i8254_offset' from boardinfo

All the boards supported by this driver have an 8254 timer at offset
0x0c. Remove this unused information from the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index b04b3ae6bf03..c7b664ae5c79 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -247,7 +247,6 @@ struct das16_board {
 	unsigned int has_ao:1;
 
 	unsigned int i8255_offset;
-	unsigned int i8254_offset;
 
 	unsigned int size;
 	unsigned int id;
@@ -261,7 +260,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_none,
 		.has_ao		= 1,
 		.i8255_offset	= 0x10,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0x00,
 	}, {
@@ -271,7 +269,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_none,
 		.has_ao		= 1,
 		.i8255_offset	= 0x10,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0x00,
 	}, {
@@ -281,7 +278,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_none,
 		.has_ao		= 1,
 		.i8255_offset	= 0x10,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0x00,
 	}, {
@@ -291,7 +287,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_none,
 		.has_ao		= 1,
 		.i8255_offset	= 0x10,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0x80,
 	}, {
@@ -301,7 +296,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_none,
 		.has_ao		= 1,
 		.i8255_offset	= 0x10,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0x80,
 	}, {
@@ -310,7 +304,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 7692,
 		.ai_pg		= das16_pg_16jr,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x10,
 		.id		= 0x00,
 	}, {
@@ -319,7 +312,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 3300,
 		.ai_pg		= das16_pg_16jr,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x10,
 		.id		= 0x00,
 	}, {
@@ -328,7 +320,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_16jr_16,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x10,
 		.id		= 0x00,
 	}, {
@@ -337,7 +328,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_16jr_16,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x10,
 		.id		= 0x00,
 	}, {
@@ -346,7 +336,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 20000,
 		.ai_pg		= das16_pg_none,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0x20,
 	}, {
@@ -355,7 +344,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_none,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0x20,
 	}, {
@@ -364,7 +352,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_1601,
 		.i8255_offset	= 0x0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -373,7 +360,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_1602,
 		.i8255_offset	= 0x0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -383,7 +369,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_1601,
 		.has_ao		= 1,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -393,7 +378,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_1602,
 		.has_ao		= 1,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -402,7 +386,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 6250,
 		.ai_pg		= das16_pg_1601,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -411,7 +394,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 6250,
 		.ai_pg		= das16_pg_1602,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -420,7 +402,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 10000,
 		.ai_pg		= das16_pg_1602,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -430,7 +411,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_1601,
 		.has_ao		= 1,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -440,7 +420,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_1602,
 		.has_ao		= 1,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -450,7 +429,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_pg		= das16_pg_1602,
 		.has_ao		= 1,
 		.i8255_offset	= 0x400,
-		.i8254_offset	= 0x0c,
 		.size		= 0x408,
 		.id		= 0xc0,
 	}, {
@@ -459,7 +437,6 @@ static const struct das16_board das16_boards[] = {
 		.ai_speed	= 3030,
 		.ai_pg		= das16_pg_16jr,
 		.i8255_offset	= 0,
-		.i8254_offset	= 0x0c,
 		.size		= 0x14,
 		.id		= 0xf0,
 	},