From patchwork Mon Apr 27 12:11:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uri Shkolnik X-Patchwork-Id: 20136 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3RCBVYQ008650 for ; Mon, 27 Apr 2009 12:11:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753821AbZD0ML3 (ORCPT ); Mon, 27 Apr 2009 08:11:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753953AbZD0ML3 (ORCPT ); Mon, 27 Apr 2009 08:11:29 -0400 Received: from web110803.mail.gq1.yahoo.com ([67.195.13.226]:28413 "HELO web110803.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753682AbZD0ML2 (ORCPT ); Mon, 27 Apr 2009 08:11:28 -0400 Received: (qmail 18436 invoked by uid 60001); 27 Apr 2009 12:11:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1240834287; bh=H9xdr1gw48s1+hKa9zPwlmrl0KRGelnNqHknmwx/3BA=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:Cc:MIME-Version:Content-Type; b=exVdF43MuAT0IVLWoH59kc76otW2BEP/bjijRPmptW/ZhAi0x3S/3lgJ/LTwLw5h38noWyf8UPxn3ClpZxa9EI0Y+AzDEm+WOQf2a+f7aFwCOVcnx/SafWiYeIeAQHshzCwtLDPW0NIND94o/dOmcDk/PRb8wsMJD6BztDl6n14= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:Cc:MIME-Version:Content-Type; b=leJLi3pe0ATCARJeJCbBioNt6pL1F/thTKBYJmyk8IIgwWkDArhSpOeduSTGFb3eFH2Lh+hReHtu3QhRwttXFvx1m0qGwebxfEbeHyrhDkl6rraAw71etMRnELtJPoe0AzCla0olB6b6fiagrl22rM1TElSvjnbIuks45BhsYhE=; Message-ID: <892743.18087.qm@web110803.mail.gq1.yahoo.com> X-YMail-OSG: Cj8OOH8VM1moGRedKarQIypAid.X_yMT2TOqtxgzqcO1GcyY8GCghdI1ctf4t7c9JL2Cj90fKsYphx2dEbfVzvzc7SVOgDjYIMi6LCLKCwJHZ4.ssKHU.QdK5KJH1OxP9nttz2pqM4r6nzIHBwGKK7cQH2lznQkPkmRJnOC_iRu9CRAPY62Ivd6VMCV8vkPNdd8Oo579nausHPrKjm3CAL0vjo710DpEGcE9_huSM2.s6Vm1wtPDwLXpAdMbbH1NH7gPy5ppits.9FuaOAWgaiAPnvVIB3we.P0IhlgLi3TM7.2L1mOki6YLHRXxj97i1yHXAEnW_SS.tst6z4Pu1pV.4fE- Received: from [199.203.99.233] by web110803.mail.gq1.yahoo.com via HTTP; Mon, 27 Apr 2009 05:11:27 PDT X-Mailer: YahooMailClassic/5.2.19 YahooMailWebService/0.7.289.1 Date: Mon, 27 Apr 2009 05:11:27 -0700 (PDT) From: Uri Shkolnik Subject: [PATCH] [0904_7_2] Siano: smsdvb - purge whitespaces To: Mauro Carvalho Chehab Cc: LinuxML MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org # HG changeset patch # User Uri Shkolnik # Date 1240833806 -10800 # Node ID cbd828b0fe102fa023280cfeadbcb20b54a39a47 # Parent 39bbe3b24abaaa3e049a855cb51be0b917b0c711 Siano: smsdvb - whitespace cleanup From: Uri Shkolnik Whitespace cleanup, no implementation changes Priority: normal Signed-off-by: Uri Shkolnik --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -r 39bbe3b24aba -r cbd828b0fe10 linux/drivers/media/dvb/siano/smsdvb.c --- a/linux/drivers/media/dvb/siano/smsdvb.c Mon Apr 27 14:43:28 2009 +0300 +++ b/linux/drivers/media/dvb/siano/smsdvb.c Mon Apr 27 15:03:26 2009 +0300 @@ -33,15 +33,15 @@ struct smsdvb_client_t { struct smscore_device_t *coredev; struct smscore_client_t *smsclient; - struct dvb_adapter adapter; - struct dvb_demux demux; - struct dmxdev dmxdev; - struct dvb_frontend frontend; + struct dvb_adapter adapter; + struct dvb_demux demux; + struct dmxdev dmxdev; + struct dvb_frontend frontend; - fe_status_t fe_status; - int fe_ber, fe_snr, fe_unc, fe_signal_strength; + fe_status_t fe_status; + int fe_ber, fe_snr, fe_unc, fe_signal_strength; - struct completion tune_done, stat_done; + struct completion tune_done, stat_done; /* todo: save freq/band instead whole struct */ struct dvb_frontend_parameters fe_params; @@ -61,7 +61,7 @@ static int smsdvb_onresponse(void *conte struct smsdvb_client_t *client = (struct smsdvb_client_t *) context; struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) (((u8 *) cb->p) + cb->offset); - u32 *pMsgData = (u32 *)phdr+1; + u32 *pMsgData = (u32 *) phdr + 1; /*u32 MsgDataLen = phdr->msgLength - sizeof(struct SmsMsgHdr_ST);*/ /*smsendian_handle_rx_message((struct SmsMsgData_ST *) phdr);*/ @@ -177,8 +177,8 @@ static int smsdvb_onresponse(void *conte if (client->fe_status & FE_HAS_LOCK) sms_board_led_feedback(client->coredev, - (client->fe_unc == 0) ? - SMS_LED_HI : SMS_LED_LO); + (client->fe_unc == 0) ? + SMS_LED_HI : SMS_LED_LO); else sms_board_led_feedback(client->coredev, SMS_LED_OFF); @@ -203,7 +203,7 @@ static void smsdvb_onremove(void *contex { kmutex_lock(&g_smsdvb_clientslock); - smsdvb_unregister_client((struct smsdvb_client_t *) context); + smsdvb_unregister_client((struct smsdvb_client_t *)context); kmutex_unlock(&g_smsdvb_clientslock); } @@ -214,13 +214,12 @@ static int smsdvb_start_feed(struct dvb_ container_of(feed->demux, struct smsdvb_client_t, demux); struct SmsMsgData_ST PidMsg; - sms_debug("add pid %d(%x)", - feed->pid, feed->pid); + sms_debug("add pid %d(%x)", feed->pid, feed->pid); PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; PidMsg.xMsgHeader.msgDstId = HIF_TASK; PidMsg.xMsgHeader.msgFlags = 0; - PidMsg.xMsgHeader.msgType = MSG_SMS_ADD_PID_FILTER_REQ; + PidMsg.xMsgHeader.msgType = MSG_SMS_ADD_PID_FILTER_REQ; PidMsg.xMsgHeader.msgLength = sizeof(PidMsg); PidMsg.msgData[0] = feed->pid; @@ -234,31 +233,31 @@ static int smsdvb_stop_feed(struct dvb_d container_of(feed->demux, struct smsdvb_client_t, demux); struct SmsMsgData_ST PidMsg; - sms_debug("remove pid %d(%x)", - feed->pid, feed->pid); + sms_debug("remove pid %d(%x)", feed->pid, feed->pid); PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; PidMsg.xMsgHeader.msgDstId = HIF_TASK; PidMsg.xMsgHeader.msgFlags = 0; - PidMsg.xMsgHeader.msgType = MSG_SMS_REMOVE_PID_FILTER_REQ; + PidMsg.xMsgHeader.msgType = MSG_SMS_REMOVE_PID_FILTER_REQ; PidMsg.xMsgHeader.msgLength = sizeof(PidMsg); PidMsg.msgData[0] = feed->pid; - return smsclient_sendrequest(client->smsclient, - &PidMsg, sizeof(PidMsg)); + return smsclient_sendrequest(client->smsclient, &PidMsg, + sizeof(PidMsg)); } static int smsdvb_sendrequest_and_wait(struct smsdvb_client_t *client, - void *buffer, size_t size, - struct completion *completion) + void *buffer, size_t size, + struct completion *completion) { - int rc = smsclient_sendrequest(client->smsclient, buffer, size); + int rc; + + rc = smsclient_sendrequest(client->smsclient, buffer, size); if (rc < 0) return rc; - return wait_for_completion_timeout(completion, - msecs_to_jiffies(2000)) ? - 0 : -ETIME; + return wait_for_completion_timeout(completion, msecs_to_jiffies(2000)) + ? 0 : -ETIME; } static int smsdvb_read_status(struct dvb_frontend *fe, fe_status_t *stat) @@ -333,18 +332,18 @@ static int smsdvb_set_frontend(struct dv struct dvb_frontend_parameters *fep) { struct smsdvb_client_t *client = - container_of(fe, struct smsdvb_client_t, frontend); + container_of(fe, struct smsdvb_client_t, frontend); struct { - struct SmsMsgHdr_ST Msg; - u32 Data[3]; + struct SmsMsgHdr_ST Msg; + u32 Data[3]; } Msg; int ret; - Msg.Msg.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - Msg.Msg.msgDstId = HIF_TASK; - Msg.Msg.msgFlags = 0; - Msg.Msg.msgType = MSG_SMS_RF_TUNE_REQ; + Msg.Msg.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; + Msg.Msg.msgDstId = HIF_TASK; + Msg.Msg.msgFlags = 0; + Msg.Msg.msgType = MSG_SMS_RF_TUNE_REQ; Msg.Msg.msgLength = sizeof(Msg); Msg.Data[0] = fep->frequency; Msg.Data[2] = 12000000; @@ -353,14 +352,24 @@ static int smsdvb_set_frontend(struct dv fep->frequency, 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; + 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; #if 0 - case BANDWIDTH_5_MHZ: Msg.Data[1] = BW_5_MHZ; break; + case BANDWIDTH_5_MHZ: + Msg.Data[1] = BW_5_MHZ; + break; #endif - case BANDWIDTH_AUTO: return -EOPNOTSUPP; - default: return -EINVAL; + case BANDWIDTH_AUTO: + return -EOPNOTSUPP; + default: + return -EINVAL; } /* Disable LNA, if any. An error is returned if no LNA is present */ @@ -395,7 +404,7 @@ static int smsdvb_get_frontend(struct dv /* todo: */ memcpy(fep, &client->fe_params, - sizeof(struct dvb_frontend_parameters)); + sizeof(struct dvb_frontend_parameters)); return 0; }