1 files changed, 27 insertions, 40 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index e4f2117..05bdec9 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -255,52 +255,39 @@ typedef enum dtv_cmd_types {
 	DTV_TUNE,
 	DTV_CLEAR,
 
-	DTV_SET_FREQUENCY,
-	DTV_SET_MODULATION,
-	DTV_SET_BANDWIDTH,
-	DTV_SET_INVERSION,
-	DTV_SET_DISEQC_MASTER,
-	DTV_SET_SYMBOL_RATE,
-	DTV_SET_INNER_FEC,
-	DTV_SET_VOLTAGE,
-	DTV_SET_TONE,
-	DTV_SET_PILOT,
-	DTV_SET_ROLLOFF,
-
-	DTV_GET_FREQUENCY,
-	DTV_GET_MODULATION,
-	DTV_GET_BANDWIDTH,
-	DTV_GET_INVERSION,
-	DTV_GET_DISEQC_SLAVE_REPLY,
-	DTV_GET_SYMBOL_RATE,
-	DTV_GET_INNER_FEC,
-	DTV_GET_VOLTAGE,
-	DTV_GET_TONE,
-	DTV_GET_PILOT,
-	DTV_GET_ROLLOFF,
+	DTV_FREQUENCY,
+	DTV_MODULATION,
+	DTV_BANDWIDTH,
+	DTV_INVERSION,
+	DTV_DISEQC_MASTER,
+	DTV_SYMBOL_RATE,
+	DTV_INNER_FEC,
+	DTV_VOLTAGE,
+	DTV_TONE,
+	DTV_PILOT,
+	DTV_ROLLOFF,
+
+	DTV_DISEQC_SLAVE_REPLY,
 
 	/* Basic enumeration set for querying unlimited capabilities */
-	DTV_GET_FE_CAPABILITY_COUNT,
-	DTV_GET_FE_CAPABILITY,
+	DTV_FE_CAPABILITY_COUNT,
+	DTV_FE_CAPABILITY,
 
 	/* New commands are always appended */
-	DTV_SET_DELIVERY_SYSTEM,
-	DTV_GET_DELIVERY_SYSTEM,
+	DTV_DELIVERY_SYSTEM,
 
 	/* ISDB-T */
-	DTV_SET_ISDB_SEGMENT_IDX,
-	DTV_GET_ISDB_SEGMENT_IDX,
-	DTV_SET_ISDB_SEGMENT_WIDTH,
-	DTV_GET_ISDB_SEGMENT_WIDTH,
-	DTV_GET_ISDB_LAYERA_FEC,
-	DTV_GET_ISDB_LAYERA_MODULATION,
-	DTV_GET_ISDB_LAYERA_SEGMENT_WIDTH,
-	DTV_GET_ISDB_LAYERB_FEC,
-	DTV_GET_ISDB_LAYERB_MODULATION,
-	DTV_GET_ISDB_LAYERB_SEGMENT_WIDTH,
-	DTV_GET_ISDB_LAYERC_FEC,
-	DTV_GET_ISDB_LAYERC_MODULATION,
-	DTV_GET_ISDB_LAYERC_SEGMENT_WIDTH,
+	DTV_ISDB_SEGMENT_IDX,
+	DTV_ISDB_SEGMENT_WIDTH,
+	DTV_ISDB_LAYERA_FEC,
+	DTV_ISDB_LAYERA_MODULATION,
+	DTV_ISDB_LAYERA_SEGMENT_WIDTH,
+	DTV_ISDB_LAYERB_FEC,
+	DTV_ISDB_LAYERB_MODULATION,
+	DTV_ISDB_LAYERB_SEGMENT_WIDTH,
+	DTV_ISDB_LAYERC_FEC,
+	DTV_ISDB_LAYERC_MODULATION,
+	DTV_ISDB_LAYERC_SEGMENT_WIDTH,
 
 } dtv_cmd_types_t;