Commit fa830e8a authored Jun 15, 2008 by Michael Krufky Committed by Mauro Carvalho Chehab Jul 20, 2008

V4L/DVB (8282): sms1xxx: more codingstyle cleanups



Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent f0333e3d

drivers/media/dvb/siano/smscoreapi.c

+17 −19

Original line number	Diff line number	Diff line
		@@ -499,8 +499,7 @@ int smscore_load_firmware_family2(smscore_device_t coredev, void buffer,
		mem_address = (u32 ) &payload[20];
		}

		while (size && rc >= 0)
		{
		while (size && rc >= 0) {
		SmsDataDownload_ST DataMsg = (SmsDataDownload_ST ) msg;
		int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);

		@@ -530,11 +529,11 @@ int smscore_load_firmware_family2(smscore_device_t coredev, void buffer,
		sizeof(SmsMsgHdr_ST) +
		sizeof(u32) * 5);

		TriggerMsg->msgData[0] = firmware->StartAddress; // Entry point
		TriggerMsg->msgData[1] = 5; // Priority
		TriggerMsg->msgData[2] = 0x200; // Stack size
		TriggerMsg->msgData[3] = 0; // Parameter
		TriggerMsg->msgData[4] = 4; // Task ID
		TriggerMsg->msgData[0] = firmware->StartAddress; /* Entry point */
		TriggerMsg->msgData[1] = 5; /* Priority */
		TriggerMsg->msgData[2] = 0x200; /* Stack size */
		TriggerMsg->msgData[3] = 0; /* Parameter */
		TriggerMsg->msgData[4] = 4; /* Task ID */

		if (coredev->device_flags & SMS_ROM_NO_RESPONSE) {
		rc = coredev->sendrequest_handler(coredev->context, TriggerMsg, TriggerMsg->xMsgHeader.msgLength);
		@@ -880,8 +879,7 @@ void smscore_onresponse(smscore_device_t coredev, smscore_buffer_t cb)
		if (!last_sample_time)
		last_sample_time = time_now;

		if (time_now - last_sample_time > 10000)
		{
		if (time_now - last_sample_time > 10000) {
		printk("\n%s data rate %d bytes/secs\n", __func__,
		(int)((data_total * 1000) /
		(time_now - last_sample_time)));
		@@ -989,9 +987,9 @@ int smscore_validate_client(smscore_device_t *coredev,
		return -EFAULT;
		}
		registered_client = smscore_find_client(coredev, data_type, id);
		if (registered_client == client) {
		if (registered_client == client)
		return 0;
		}

		if (registered_client) {
		PERROR("The msg ID already registered to another client.\n");
		return -EEXIST;

drivers/media/dvb/siano/smsdvb.c

+17 −19

Original line number	Diff line number	Diff line
		@@ -49,8 +49,7 @@ int smsdvb_onresponse(void context, smscore_buffer_t cb)
		SmsMsgStatisticsInfo_ST *p =
		(SmsMsgStatisticsInfo_ST *)(phdr + 1);

		if (p->Stat.IsDemodLocked)
		{
		if (p->Stat.IsDemodLocked) {
		client->fe_status = FE_HAS_SIGNAL \|
		FE_HAS_CARRIER \|
		FE_HAS_VITERBI \|
		@@ -85,7 +84,7 @@ int smsdvb_onresponse(void context, smscore_buffer_t cb)

		void smsdvb_unregister_client(smsdvb_client_t *client)
		{
		// must be called under clientslock
		/* must be called under clientslock */

		list_del(&client->entry);

		@@ -243,8 +242,7 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
		printk("%s freq %d band %d\n", __func__,
		fep->frequency, fep->u.ofdm.bandwidth);

		switch(fep->u.ofdm.bandwidth)
		{
		switch (fep->u.ofdm.bandwidth) {
		case BANDWIDTH_8_MHZ: Msg.Data[1] = BW_8_MHZ; break;
		case BANDWIDTH_7_MHZ: Msg.Data[1] = BW_7_MHZ; break;
		case BANDWIDTH_6_MHZ: Msg.Data[1] = BW_6_MHZ; break;
		@@ -263,7 +261,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,

		printk("%s\n", __func__);

		// todo:
		/* todo: */
		memcpy(fep, &client->fe_params,
		sizeof(struct dvb_frontend_parameters));
		return 0;
		@@ -271,7 +269,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,

		static void smsdvb_release(struct dvb_frontend *fe)
		{
		// do nothing
		/* do nothing */
		}

		static struct dvb_frontend_ops smsdvb_fe_ops = {
		@@ -310,7 +308,7 @@ int smsdvb_hotplug(smscore_device_t *coredev,
		smsdvb_client_t *client;
		int rc;

		// device removal handled by onremove callback
		/* device removal handled by onremove callback */
		if (!arrival)
		return 0;

		@@ -325,7 +323,7 @@ int smsdvb_hotplug(smscore_device_t *coredev,
		return -ENOMEM;
		}

		// register dvb adapter
		/* register dvb adapter */
		rc = dvb_register_adapter(&client->adapter, "Siano Digital Receiver",
		THIS_MODULE, device, adapter_nr);
		if (rc < 0) {
		@@ -333,9 +331,9 @@ int smsdvb_hotplug(smscore_device_t *coredev,
		goto adapter_error;
		}

		// init dvb demux
		/* init dvb demux */
		client->demux.dmx.capabilities = DMX_TS_FILTERING;
		client->demux.filternum = 32; // todo: nova ???
		client->demux.filternum = 32; /* todo: nova ??? */
		client->demux.feednum = 32;
		client->demux.start_feed = smsdvb_start_feed;
		client->demux.stop_feed = smsdvb_stop_feed;
		@@ -346,7 +344,7 @@ int smsdvb_hotplug(smscore_device_t *coredev,
		goto dvbdmx_error;
		}

		// init dmxdev
		/* init dmxdev */
		client->dmxdev.filternum = 32;
		client->dmxdev.demux = &client->demux.dmx;
		client->dmxdev.capabilities = 0;
		@@ -357,7 +355,7 @@ int smsdvb_hotplug(smscore_device_t *coredev,
		goto dmxdev_error;
		}

		// init and register frontend
		/* init and register frontend */
		memcpy(&client->frontend.ops, &smsdvb_fe_ops,
		sizeof(struct dvb_frontend_ops));

drivers/media/dvb/siano/smsusb.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ void smsusb_term_device(struct usb_interface *intf)
		if (dev) {
		smsusb_stop_streaming(dev);

		// unregister from smscore
		/* unregister from smscore */
		if (dev->coredev)
		smscore_unregister_device(dev->coredev);

		@@ -293,7 +293,7 @@ int smsusb_init_device(struct usb_interface *intf)
		smsusb_device_t *dev;
		int i, rc;

		// create device object
		/* create device object */
		dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL);
		if (!dev) {
		printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n",
		@@ -357,7 +357,7 @@ int smsusb_init_device(struct usb_interface *intf)
		return rc;
		}

		// initialize urbs
		/* initialize urbs */
		for (i = 0; i < MAX_URBS; i++) {
		dev->surbs[i].dev = dev;
		usb_init_urb(&dev->surbs[i].urb);

drivers/media/dvb/siano/smscoreapi.h

+2 −2

File changed.

Contains only whitespace changes.