From b53f8f3836f995485abfc00f5f0faa90106ba3f0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 26 Dec 2011 14:39:48 -0300
Subject: [PATCH] --- yaml --- r: 285551 b: refs/heads/master c:
 836a52bff76ff105d80a337ebe68a049900b3331 h: refs/heads/master i:   285549:
 871a7ca5ea3db79af7ebc141b56d874c4d5066e7   285547:
 26267937c04707808b5b1e2a1dc5cbf9aedc2bdc   285543:
 6effc2e0cbd105110fdff6773ed2ee7f7ecc835b   285535:
 76e4047d6c5f90e836dd3231f68fb6ff46b768b3 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/dvb/frontends/stv090x.c | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 7eb646f72caf..9167a09a4af6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38d945e05c20d29aa01f1bb3806281a4d2bd3a36
+refs/heads/master: 836a52bff76ff105d80a337ebe68a049900b3331
diff --git a/trunk/drivers/media/dvb/frontends/stv090x.c b/trunk/drivers/media/dvb/frontends/stv090x.c
index 8a2637c20d7c..574ef67fcdad 100644
--- a/trunk/drivers/media/dvb/frontends/stv090x.c
+++ b/trunk/drivers/media/dvb/frontends/stv090x.c
@@ -4711,23 +4711,8 @@ int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,
 }
 EXPORT_SYMBOL(stv090x_set_gpio);
 
-static int stv090x_get_property(struct dvb_frontend *fe, struct dtv_property *p)
-{
-	switch (p->cmd) {
-	case DTV_ENUM_DELSYS:
-		p->u.buffer.data[0] = SYS_DSS;
-		p->u.buffer.data[1] = SYS_DVBS;
-		p->u.buffer.data[2] = SYS_DVBS2;
-		p->u.buffer.len = 3;
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-
 static struct dvb_frontend_ops stv090x_ops = {
-
+	.delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
 	.info = {
 		.name			= "STV090x Multistandard",
 		.type			= FE_QPSK,
@@ -4759,8 +4744,6 @@ static struct dvb_frontend_ops stv090x_ops = {
 	.read_ber			= stv090x_read_per,
 	.read_signal_strength		= stv090x_read_signal_strength,
 	.read_snr			= stv090x_read_cnr,
-
-	.get_property			= stv090x_get_property,
 };