Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0df289a2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dvb: Get rid of typedev usage for enums 



The DVB API was originally defined using typedefs. This is against
Kernel CodingStyle, and there's no good usage here. While we can't
remove its usage on userspace, we can avoid its usage in Kernelspace.

So, let's do it.

This patch was generated by this shell script:

	for j in $(grep typedef include/uapi/linux/dvb/frontend.h |cut -d' ' -f 3); do for i in $(find drivers/media -name '*.[ch]' -type f) $(find drivers/staging/media -name '*.[ch]' -type f); do sed "s,${j}_t,enum $j," <$i >a && mv a $i; done; done

While here, make CodingStyle fixes on the affected lines.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> # for drivers/media/firewire/*
parent fe557e40

drivers/media/common/b2c2/flexcop-fe-tuner.c

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static int flexcop_fe_request_firmware(struct dvb_frontend *fe, 


/* lnb control */

#if FE_SUPPORTED(MT312) || FE_SUPPORTED(STV0299)

static int flexcop_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)

static int flexcop_set_voltage(struct dvb_frontend *fe,

			       enum fe_sec_voltage voltage)

{

	struct flexcop_device *fc = fe->dvb->priv;

	flexcop_ibi_value v;
@@ -78,7 +79,7 @@ static int flexcop_sleep(struct dvb_frontend* fe) 


/* SkyStar2 DVB-S rev 2.3 */

#if FE_SUPPORTED(MT312) && FE_SUPPORTED(PLL)

static int flexcop_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)

static int flexcop_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone)

{

/* u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc }; */

	struct flexcop_device *fc = fe->dvb->priv;
@@ -157,7 +158,7 @@ static int flexcop_diseqc_send_master_cmd(struct dvb_frontend *fe, 
}



static int flexcop_diseqc_send_burst(struct dvb_frontend *fe,

	fe_sec_mini_cmd_t minicmd)

				     enum fe_sec_mini_cmd minicmd)

{

	return flexcop_send_diseqc_msg(fe, 0, NULL, minicmd);

}

drivers/media/common/siano/smsdvb-main.c

+3 −3
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ static inline int led_feedback(struct smsdvb_client_t *client) 
				     SMS_LED_HI : SMS_LED_LO);

}



static int smsdvb_read_status(struct dvb_frontend *fe, fe_status_t *stat)

static int smsdvb_read_status(struct dvb_frontend *fe, enum fe_status *stat)

{

	int rc;

	struct smsdvb_client_t *client;
@@ -900,7 +900,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe) 
	/* Disable LNA, if any. An error is returned if no LNA is present */

	ret = sms_board_lna_control(client->coredev, 0);

	if (ret == 0) {

		fe_status_t status;

		enum fe_status status;



		/* tune with LNA off at first */

		ret = smsdvb_sendrequest_and_wait(client, &msg, sizeof(msg),
@@ -971,7 +971,7 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe) 
	/* Disable LNA, if any. An error is returned if no LNA is present */

	ret = sms_board_lna_control(client->coredev, 0);

	if (ret == 0) {

		fe_status_t status;

		enum fe_status status;



		/* tune with LNA off at first */

		ret = smsdvb_sendrequest_and_wait(client, &msg, sizeof(msg),

drivers/media/common/siano/smsdvb.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct smsdvb_client_t { 
	struct dmxdev           dmxdev;

	struct dvb_frontend     frontend;



	fe_status_t             fe_status;

	enum fe_status          fe_status;



	struct completion       tune_done;

	struct completion       stats_done;

drivers/media/dvb-core/dvb_frontend.c

+16 −11
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct dvb_frontend_private { 
	struct task_struct *thread;

	unsigned long release_jiffies;

	unsigned int wakeup;

	fe_status_t status;

	enum fe_status status;

	unsigned long tune_mode_flags;

	unsigned int delay;

	unsigned int reinitialise;
@@ -198,7 +198,8 @@ static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system) 
	}

}



static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)

static void dvb_frontend_add_event(struct dvb_frontend *fe,

				   enum fe_status status)

{

	struct dvb_frontend_private *fepriv = fe->frontend_priv;

	struct dvb_fe_events *events = &fepriv->events;
@@ -429,7 +430,7 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra 


static void dvb_frontend_swzigzag(struct dvb_frontend *fe)

{

	fe_status_t s = 0;

	enum fe_status s = 0;

	int retval = 0;

	struct dvb_frontend_private *fepriv = fe->frontend_priv;

	struct dtv_frontend_properties *c = &fe->dtv_property_cache, tmp;
@@ -690,7 +691,7 @@ static int dvb_frontend_thread(void *data) 
{

	struct dvb_frontend *fe = data;

	struct dvb_frontend_private *fepriv = fe->frontend_priv;

	fe_status_t s;

	enum fe_status s;

	enum dvbfe_algo algo;

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	int ret;
@@ -2341,7 +2342,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 
	}



	case FE_READ_STATUS: {

		fe_status_t* status = parg;

		enum fe_status *status = parg;



		/* if retune was requested but hasn't occurred yet, prevent

		 * that user get signal state from previous tuning */
@@ -2411,7 +2412,8 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 


	case FE_DISEQC_SEND_BURST:

		if (fe->ops.diseqc_send_burst) {

			err = fe->ops.diseqc_send_burst(fe, (fe_sec_mini_cmd_t) parg);

			err = fe->ops.diseqc_send_burst(fe,

						(enum fe_sec_mini_cmd)parg);

			fepriv->state = FESTATE_DISEQC;

			fepriv->status = 0;

		}
@@ -2419,8 +2421,9 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 


	case FE_SET_TONE:

		if (fe->ops.set_tone) {

			err = fe->ops.set_tone(fe, (fe_sec_tone_mode_t) parg);

			fepriv->tone = (fe_sec_tone_mode_t) parg;

			err = fe->ops.set_tone(fe,

					       (enum fe_sec_tone_mode)parg);

			fepriv->tone = (enum fe_sec_tone_mode)parg;

			fepriv->state = FESTATE_DISEQC;

			fepriv->status = 0;

		}
@@ -2428,8 +2431,9 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 


	case FE_SET_VOLTAGE:

		if (fe->ops.set_voltage) {

			err = fe->ops.set_voltage(fe, (fe_sec_voltage_t) parg);

			fepriv->voltage = (fe_sec_voltage_t) parg;

			err = fe->ops.set_voltage(fe,

						  (enum fe_sec_voltage)parg);

			fepriv->voltage = (enum fe_sec_voltage)parg;

			fepriv->state = FESTATE_DISEQC;

			fepriv->status = 0;

		}
@@ -2437,7 +2441,8 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 


	case FE_DISHNETWORK_SEND_LEGACY_CMD:

		if (fe->ops.dishnetwork_send_legacy_command) {

			err = fe->ops.dishnetwork_send_legacy_command(fe, (unsigned long) parg);

			err = fe->ops.dishnetwork_send_legacy_command(fe,

							 (unsigned long)parg);

			fepriv->state = FESTATE_DISEQC;

			fepriv->status = 0;

		} else if (fe->ops.set_voltage) {

drivers/media/dvb-core/dvb_frontend.h

+22 −20
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ struct dvb_frontend_ops { 
		    bool re_tune,

		    unsigned int mode_flags,

		    unsigned int *delay,

		    fe_status_t *status);

		    enum fe_status *status);

	/* get frontend tuning algorithm from the module */

	enum dvbfe_algo (*get_frontend_algo)(struct dvb_frontend *fe);
@@ -289,7 +289,7 @@ struct dvb_frontend_ops { 


	int (*get_frontend)(struct dvb_frontend *fe);



	int (*read_status)(struct dvb_frontend* fe, fe_status_t* status);

	int (*read_status)(struct dvb_frontend *fe, enum fe_status *status);

	int (*read_ber)(struct dvb_frontend* fe, u32* ber);

	int (*read_signal_strength)(struct dvb_frontend* fe, u16* strength);

	int (*read_snr)(struct dvb_frontend* fe, u16* snr);
@@ -298,9 +298,11 @@ struct dvb_frontend_ops { 
	int (*diseqc_reset_overload)(struct dvb_frontend* fe);

	int (*diseqc_send_master_cmd)(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd);

	int (*diseqc_recv_slave_reply)(struct dvb_frontend* fe, struct dvb_diseqc_slave_reply* reply);

	int (*diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);

	int (*set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);

	int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);

	int (*diseqc_send_burst)(struct dvb_frontend *fe,

				 enum fe_sec_mini_cmd minicmd);

	int (*set_tone)(struct dvb_frontend *fe, enum fe_sec_tone_mode tone);

	int (*set_voltage)(struct dvb_frontend *fe,

			   enum fe_sec_voltage voltage);

	int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);

	int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);

	int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
@@ -338,24 +340,24 @@ struct dtv_frontend_properties { 
	u32			state;



	u32			frequency;

	fe_modulation_t		modulation;

	enum fe_modulation		modulation;



	fe_sec_voltage_t	voltage;

	fe_sec_tone_mode_t	sectone;

	fe_spectral_inversion_t	inversion;

	fe_code_rate_t		fec_inner;

	fe_transmit_mode_t	transmission_mode;

	enum fe_sec_voltage	voltage;

	enum fe_sec_tone_mode	sectone;

	enum fe_spectral_inversion	inversion;

	enum fe_code_rate		fec_inner;

	enum fe_transmit_mode	transmission_mode;

	u32			bandwidth_hz;	/* 0 = AUTO */

	fe_guard_interval_t	guard_interval;

	fe_hierarchy_t		hierarchy;

	enum fe_guard_interval	guard_interval;

	enum fe_hierarchy		hierarchy;

	u32			symbol_rate;

	fe_code_rate_t		code_rate_HP;

	fe_code_rate_t		code_rate_LP;

	enum fe_code_rate		code_rate_HP;

	enum fe_code_rate		code_rate_LP;



	fe_pilot_t		pilot;

	fe_rolloff_t		rolloff;

	enum fe_pilot		pilot;

	enum fe_rolloff		rolloff;



	fe_delivery_system_t	delivery_system;

	enum fe_delivery_system	delivery_system;



	enum fe_interleaving	interleaving;
@@ -368,8 +370,8 @@ struct dtv_frontend_properties { 
	u8			isdbt_layer_enabled;

	struct {

	    u8			segment_count;

	    fe_code_rate_t	fec;

	    fe_modulation_t	modulation;

	    enum fe_code_rate	fec;

	    enum fe_modulation	modulation;

	    u8			interleaving;

	} layer[3];