diff options
author | Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-08-19 10:09:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:17:35 -0400 |
commit | 2ded0fe140738accc4213d08b5605f7805fd18d3 (patch) | |
tree | d1cfcf8f12df6a5fff9a4273e2540028f571dfe5 /drivers/media/video/cx231xx | |
parent | b6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b (diff) |
[media] cx231xx: whitespace cleanup
Fix some indentation problems and remove an "if (1)" from the Colibri setup
function.
Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-avcore.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index a9e6cbe26ce5..580fe535b644 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c | |||
@@ -1482,43 +1482,38 @@ void cx231xx_Setup_AFE_for_LowIF(struct cx231xx *dev) | |||
1482 | void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq, | 1482 | void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq, |
1483 | u8 spectral_invert, u32 mode) | 1483 | u8 spectral_invert, u32 mode) |
1484 | { | 1484 | { |
1485 | 1485 | u32 colibri_carrier_offset = 0; | |
1486 | u32 colibri_carrier_offset = 0; | 1486 | u8 status = 0; |
1487 | u8 status = 0; | 1487 | u32 func_mode = 0x01; /* Device has a DIF if this function is called */ |
1488 | u32 func_mode = 0x01; /* Device has an DIF if this function is called */ | 1488 | u32 standard = 0; |
1489 | u32 standard = 0; | ||
1490 | u8 value[4] = { 0, 0, 0, 0 }; | 1489 | u8 value[4] = { 0, 0, 0, 0 }; |
1491 | 1490 | ||
1492 | cx231xx_info("Enter cx231xx_set_Colibri_For_LowIF()\n"); | 1491 | cx231xx_info("Enter cx231xx_set_Colibri_For_LowIF()\n"); |
1493 | value[0] = (u8) 0x6F; | 1492 | value[0] = (u8) 0x6F; |
1494 | value[1] = (u8) 0x6F; | 1493 | value[1] = (u8) 0x6F; |
1495 | value[2] = (u8) 0x6F; | 1494 | value[2] = (u8) 0x6F; |
1496 | value[3] = (u8) 0x6F; | 1495 | value[3] = (u8) 0x6F; |
1497 | status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, | 1496 | status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, |
1498 | PWR_CTL_EN, value, 4); | 1497 | PWR_CTL_EN, value, 4); |
1499 | if (1) { | ||
1500 | 1498 | ||
1501 | /*Set colibri for low IF*/ | 1499 | /*Set colibri for low IF*/ |
1502 | status = cx231xx_afe_set_mode(dev, AFE_MODE_LOW_IF); | 1500 | status = cx231xx_afe_set_mode(dev, AFE_MODE_LOW_IF); |
1503 | 1501 | ||
1504 | |||
1505 | /* Set C2HH for low IF operation.*/ | 1502 | /* Set C2HH for low IF operation.*/ |
1506 | standard = dev->norm; | 1503 | standard = dev->norm; |
1507 | status = cx231xx_dif_configure_C2HH_for_low_IF(dev, dev->active_mode, | 1504 | status = cx231xx_dif_configure_C2HH_for_low_IF(dev, dev->active_mode, |
1508 | func_mode, standard); | 1505 | func_mode, standard); |
1509 | |||
1510 | 1506 | ||
1511 | /* Get colibri offsets.*/ | 1507 | /* Get colibri offsets.*/ |
1512 | colibri_carrier_offset = cx231xx_Get_Colibri_CarrierOffset(mode, | 1508 | colibri_carrier_offset = cx231xx_Get_Colibri_CarrierOffset(mode, |
1513 | standard); | 1509 | standard); |
1514 | 1510 | ||
1515 | cx231xx_info("colibri_carrier_offset=%d, standard=0x%x\n", | 1511 | cx231xx_info("colibri_carrier_offset=%d, standard=0x%x\n", |
1516 | colibri_carrier_offset, standard); | 1512 | colibri_carrier_offset, standard); |
1517 | 1513 | ||
1518 | /* Set the band Pass filter for DIF*/ | 1514 | /* Set the band Pass filter for DIF*/ |
1519 | cx231xx_set_DIF_bandpass(dev, (if_freq+colibri_carrier_offset) | 1515 | cx231xx_set_DIF_bandpass(dev, (if_freq+colibri_carrier_offset), |
1520 | , spectral_invert, mode); | 1516 | spectral_invert, mode); |
1521 | } | ||
1522 | } | 1517 | } |
1523 | 1518 | ||
1524 | u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) | 1519 | u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) |