[media] drx-j: get rid of most of the typedefs

There are lots of typedefs there. Let's get rid of them.

Most of the work here is due to this small script:

	if [ "$3" == "" ]; then
		echo "usage: $0 type DRXName drx_name"
	fi
	t=$1; f=$2; g=$3
	for i in *.[ch]; do
		sed s,"p${f}_t","$t $g *",g <$i >a && mv a $i && \
		sed s,"${f}_t","$t $g",g <$i >a && mv a $i
	done

Just kept there the function typedefs, as those are still useful.

Yet, all those tuner_ops can likely be just removed on a latter
cleanup patch.

Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/dvb-frontends/drx39xyj/drx39xxj.c b/drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
index d68b34b..414d152 100644 (file)
--- a/drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
@@ -34,7 +34,7 @@ static int drx39xxj_set_powerstate(struct dvb_frontend *fe, int enable)
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXPowerMode_t powerMode;
 
        if (enable)
@@ -56,7 +56,7 @@ static int drx39xxj_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXLockStatus_t lock_status;
 
        *status = 0;
@@ -103,7 +103,7 @@ static int drx39xxj_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXSigQuality_t sig_quality;
 
        result = DRX_Ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
@@ -122,7 +122,7 @@ static int drx39xxj_read_signal_strength(struct dvb_frontend *fe,
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXSigQuality_t sig_quality;
 
        result = DRX_Ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
@@ -141,7 +141,7 @@ static int drx39xxj_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXSigQuality_t sig_quality;
 
        result = DRX_Ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
@@ -159,7 +159,7 @@ static int drx39xxj_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStatus_t result;
+       int result;
        DRXSigQuality_t sig_quality;
 
        result = DRX_Ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
@@ -181,9 +181,9 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe)
        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
-       DRXStandard_t standard = DRX_STANDARD_8VSB;
+       enum drx_standard standard = DRX_STANDARD_8VSB;
        DRXChannel_t channel;
-       DRXStatus_t result;
+       int result;
        DRXUIOData_t uioData;
        DRXChannel_t defChannel = { /* frequency      */ 0,
                /* bandwidth      */ DRX_BANDWIDTH_6MHZ,
@@ -270,7 +270,7 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
        struct drx39xxj_state *state = fe->demodulator_priv;
        DRXDemodInstance_t *demod = state->demod;
        bool i2c_gate_state;
-       DRXStatus_t result;
+       int result;
 
 #ifdef DJH_DEBUG
        printk(KERN_DBG "i2c gate call: enable=%d state=%d\n", enable,
@@ -331,7 +331,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
        DRXDemodInstance_t *demod = NULL;
        DRXUIOCfg_t uioCfg;
        DRXUIOData_t uioData;
-       DRXStatus_t result;
+       int result;
 
        /* allocate memory for the internal state */
        state = kmalloc(sizeof(struct drx39xxj_state), GFP_KERNEL);

diff --cc drivers/media/dvb-frontends/drx39xyj/drx39xxj.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx39xxj_dummy.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_driver.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_driver.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj.h
Simple merge