diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-01 22:21:32 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-01 22:21:32 +0300 |
commit | 307d59039fb26212a84a9aa6a134a7d2bdea34ca (patch) | |
tree | dca021901b6e13b04bd4ab1671d28081a80016d9 /drivers/media/common | |
parent | b84acc11b1c9552c9ca3a099b1610a6018619332 (diff) | |
parent | 9a5d660fdb25d20748d7f9e9559c86073c3bb368 (diff) | |
download | linux-307d59039fb26212a84a9aa6a134a7d2bdea34ca.tar.xz |
Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- new i2c drivers: ds90ub913, ds90ub953, ds90ub960, dw9719, ds90ub913
- new Intel IVSC MEI drivers
- some Mediatek platform drivers were moved to a common location
- Intel atomisp2 driver is now working with the main ov2680 driver. Due
to that, the atomisp2 ov2680 staging one was removed
- the bttv driver was finally converted to videobuf2 framework. This
was the last one upstream using videobuf version 1 core. We'll likely
remove the old videobuf framework on 6.7
- lots of improvements at atomisp driver: it now works with normal I2C
sensors. Several compile-mode dependecies to select between ISP2400
and ISP2401 are now solved in runtime
- a new ipu-bridge logic was added to work with IVSC MEI drivers
- venus driver gained better support for new VPU versions
- the v4l core async framework has gained lots of improvements and
cleanups
- lots of other cleanups, improvements and driver fixes
* tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (358 commits)
media: ivsc: Add ACPI dependency
media: bttv: convert to vb2
media: bttv: use audio defaults for winfast2000
media: bttv: refactor bttv_set_dma()
media: bttv: move vbi_skip/vbi_count out of buffer
media: bttv: remove crop info from bttv_buffer
media: bttv: remove tvnorm field from bttv_buffer
media: bttv: remove format field from bttv_buffer
media: bttv: move do_crop flag out of bttv_fh
media: bttv: copy vbi_fmt from bttv_fh
media: bttv: copy vid fmt/width/height from fh
media: bttv: radio use v4l2_fh instead of bttv_fh
media: bttv: replace BUG with WARN_ON
media: bttv: use video_drvdata to get bttv
media: i2c: rdacm21: Fix uninitialized value
media: coda: Remove duplicated include
media: vivid: fix the racy dev->radio_tx_rds_owner
media: i2c: ccs: Check rules is non-NULL
media: i2c: ds90ub960: Fix PLL config for 1200 MHz CSI rate
media: i2c: ds90ub953: Fix use of uninitialized variables
...
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/siano/smsdvb-debugfs.c | 334 | ||||
-rw-r--r-- | drivers/media/common/siano/smsendian.c | 2 |
2 files changed, 118 insertions, 218 deletions
diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c index 8916bb644756..e0beefd80d7b 100644 --- a/drivers/media/common/siano/smsdvb-debugfs.c +++ b/drivers/media/common/siano/smsdvb-debugfs.c @@ -45,89 +45,48 @@ static void smsdvb_print_dvb_stats(struct smsdvb_debugfs *debug_data, buf = debug_data->stats_data; - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_rf_locked = %d\n", p->is_rf_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_demod_locked = %d\n", p->is_demod_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_external_lna_on = %d\n", p->is_external_lna_on); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "SNR = %d\n", p->SNR); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "ber = %d\n", p->ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "FIB_CRC = %d\n", p->FIB_CRC); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "ts_per = %d\n", p->ts_per); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "MFER = %d\n", p->MFER); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "RSSI = %d\n", p->RSSI); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "in_band_pwr = %d\n", p->in_band_pwr); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "carrier_offset = %d\n", p->carrier_offset); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "modem_state = %d\n", p->modem_state); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "frequency = %d\n", p->frequency); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "bandwidth = %d\n", p->bandwidth); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "transmission_mode = %d\n", p->transmission_mode); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "modem_state = %d\n", p->modem_state); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "guard_interval = %d\n", p->guard_interval); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "code_rate = %d\n", p->code_rate); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "lp_code_rate = %d\n", p->lp_code_rate); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "hierarchy = %d\n", p->hierarchy); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "constellation = %d\n", p->constellation); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "burst_size = %d\n", p->burst_size); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "burst_duration = %d\n", p->burst_duration); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "burst_cycle_time = %d\n", p->burst_cycle_time); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "calc_burst_cycle_time = %d\n", - p->calc_burst_cycle_time); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_rows = %d\n", p->num_of_rows); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_padd_cols = %d\n", p->num_of_padd_cols); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_punct_cols = %d\n", p->num_of_punct_cols); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "error_ts_packets = %d\n", p->error_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "total_ts_packets = %d\n", p->total_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_valid_mpe_tlbs = %d\n", p->num_of_valid_mpe_tlbs); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_invalid_mpe_tlbs = %d\n", p->num_of_invalid_mpe_tlbs); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_corrected_mpe_tlbs = %d\n", p->num_of_corrected_mpe_tlbs); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "ber_error_count = %d\n", p->ber_error_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "ber_bit_count = %d\n", p->ber_bit_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "pre_ber = %d\n", p->pre_ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "cell_id = %d\n", p->cell_id); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "dvbh_srv_ind_hp = %d\n", p->dvbh_srv_ind_hp); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "dvbh_srv_ind_lp = %d\n", p->dvbh_srv_ind_lp); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_mpe_received = %d\n", p->num_mpe_received); + n += sysfs_emit_at(buf, n, "is_rf_locked = %d\n", p->is_rf_locked); + n += sysfs_emit_at(buf, n, "is_demod_locked = %d\n", p->is_demod_locked); + n += sysfs_emit_at(buf, n, "is_external_lna_on = %d\n", p->is_external_lna_on); + n += sysfs_emit_at(buf, n, "SNR = %d\n", p->SNR); + n += sysfs_emit_at(buf, n, "ber = %d\n", p->ber); + n += sysfs_emit_at(buf, n, "FIB_CRC = %d\n", p->FIB_CRC); + n += sysfs_emit_at(buf, n, "ts_per = %d\n", p->ts_per); + n += sysfs_emit_at(buf, n, "MFER = %d\n", p->MFER); + n += sysfs_emit_at(buf, n, "RSSI = %d\n", p->RSSI); + n += sysfs_emit_at(buf, n, "in_band_pwr = %d\n", p->in_band_pwr); + n += sysfs_emit_at(buf, n, "carrier_offset = %d\n", p->carrier_offset); + n += sysfs_emit_at(buf, n, "modem_state = %d\n", p->modem_state); + n += sysfs_emit_at(buf, n, "frequency = %d\n", p->frequency); + n += sysfs_emit_at(buf, n, "bandwidth = %d\n", p->bandwidth); + n += sysfs_emit_at(buf, n, "transmission_mode = %d\n", p->transmission_mode); + n += sysfs_emit_at(buf, n, "modem_state = %d\n", p->modem_state); + n += sysfs_emit_at(buf, n, "guard_interval = %d\n", p->guard_interval); + n += sysfs_emit_at(buf, n, "code_rate = %d\n", p->code_rate); + n += sysfs_emit_at(buf, n, "lp_code_rate = %d\n", p->lp_code_rate); + n += sysfs_emit_at(buf, n, "hierarchy = %d\n", p->hierarchy); + n += sysfs_emit_at(buf, n, "constellation = %d\n", p->constellation); + n += sysfs_emit_at(buf, n, "burst_size = %d\n", p->burst_size); + n += sysfs_emit_at(buf, n, "burst_duration = %d\n", p->burst_duration); + n += sysfs_emit_at(buf, n, "burst_cycle_time = %d\n", p->burst_cycle_time); + n += sysfs_emit_at(buf, n, "calc_burst_cycle_time = %d\n", p->calc_burst_cycle_time); + n += sysfs_emit_at(buf, n, "num_of_rows = %d\n", p->num_of_rows); + n += sysfs_emit_at(buf, n, "num_of_padd_cols = %d\n", p->num_of_padd_cols); + n += sysfs_emit_at(buf, n, "num_of_punct_cols = %d\n", p->num_of_punct_cols); + n += sysfs_emit_at(buf, n, "error_ts_packets = %d\n", p->error_ts_packets); + n += sysfs_emit_at(buf, n, "total_ts_packets = %d\n", p->total_ts_packets); + n += sysfs_emit_at(buf, n, "num_of_valid_mpe_tlbs = %d\n", p->num_of_valid_mpe_tlbs); + n += sysfs_emit_at(buf, n, "num_of_invalid_mpe_tlbs = %d\n", p->num_of_invalid_mpe_tlbs); + n += sysfs_emit_at(buf, n, "num_of_corrected_mpe_tlbs = %d\n", + p->num_of_corrected_mpe_tlbs); + n += sysfs_emit_at(buf, n, "ber_error_count = %d\n", p->ber_error_count); + n += sysfs_emit_at(buf, n, "ber_bit_count = %d\n", p->ber_bit_count); + n += sysfs_emit_at(buf, n, "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors); + n += sysfs_emit_at(buf, n, "pre_ber = %d\n", p->pre_ber); + n += sysfs_emit_at(buf, n, "cell_id = %d\n", p->cell_id); + n += sysfs_emit_at(buf, n, "dvbh_srv_ind_hp = %d\n", p->dvbh_srv_ind_hp); + n += sysfs_emit_at(buf, n, "dvbh_srv_ind_lp = %d\n", p->dvbh_srv_ind_lp); + n += sysfs_emit_at(buf, n, "num_mpe_received = %d\n", p->num_mpe_received); debug_data->stats_count = n; spin_unlock(&debug_data->lock); @@ -148,78 +107,49 @@ static void smsdvb_print_isdb_stats(struct smsdvb_debugfs *debug_data, buf = debug_data->stats_data; - n += scnprintf(&buf[n], PAGE_SIZE - n, - "statistics_type = %d\t", p->statistics_type); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "full_size = %d\n", p->full_size); - - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_rf_locked = %d\t\t", p->is_rf_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_demod_locked = %d\t", p->is_demod_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_external_lna_on = %d\n", p->is_external_lna_on); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "SNR = %d dB\t\t", p->SNR); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "RSSI = %d dBm\t\t", p->RSSI); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "in_band_pwr = %d dBm\n", p->in_band_pwr); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "carrier_offset = %d\t", p->carrier_offset); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "bandwidth = %d\t\t", p->bandwidth); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "frequency = %d Hz\n", p->frequency); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "transmission_mode = %d\t", p->transmission_mode); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "modem_state = %d\t\t", p->modem_state); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "guard_interval = %d\n", p->guard_interval); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "system_type = %d\t\t", p->system_type); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "partial_reception = %d\t", p->partial_reception); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_layers = %d\n", p->num_of_layers); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors); + n += sysfs_emit_at(buf, n, "statistics_type = %d\t", p->statistics_type); + n += sysfs_emit_at(buf, n, "full_size = %d\n", p->full_size); + + n += sysfs_emit_at(buf, n, "is_rf_locked = %d\t\t", p->is_rf_locked); + n += sysfs_emit_at(buf, n, "is_demod_locked = %d\t", p->is_demod_locked); + n += sysfs_emit_at(buf, n, "is_external_lna_on = %d\n", p->is_external_lna_on); + n += sysfs_emit_at(buf, n, "SNR = %d dB\t\t", p->SNR); + n += sysfs_emit_at(buf, n, "RSSI = %d dBm\t\t", p->RSSI); + n += sysfs_emit_at(buf, n, "in_band_pwr = %d dBm\n", p->in_band_pwr); + n += sysfs_emit_at(buf, n, "carrier_offset = %d\t", p->carrier_offset); + n += sysfs_emit_at(buf, n, "bandwidth = %d\t\t", p->bandwidth); + n += sysfs_emit_at(buf, n, "frequency = %d Hz\n", p->frequency); + n += sysfs_emit_at(buf, n, "transmission_mode = %d\t", p->transmission_mode); + n += sysfs_emit_at(buf, n, "modem_state = %d\t\t", p->modem_state); + n += sysfs_emit_at(buf, n, "guard_interval = %d\n", p->guard_interval); + n += sysfs_emit_at(buf, n, "system_type = %d\t\t", p->system_type); + n += sysfs_emit_at(buf, n, "partial_reception = %d\t", p->partial_reception); + n += sysfs_emit_at(buf, n, "num_of_layers = %d\n", p->num_of_layers); + n += sysfs_emit_at(buf, n, "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors); for (i = 0; i < 3; i++) { if (p->layer_info[i].number_of_segments < 1 || p->layer_info[i].number_of_segments > 13) continue; - n += scnprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tcode_rate = %d\t", - p->layer_info[i].code_rate); - n += scnprintf(&buf[n], PAGE_SIZE - n, "constellation = %d\n", - p->layer_info[i].constellation); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tber = %-5d\t", - p->layer_info[i].ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\tber_error_count = %-5d\t", - p->layer_info[i].ber_error_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, "ber_bit_count = %-5d\n", - p->layer_info[i].ber_bit_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tpre_ber = %-5d\t", - p->layer_info[i].pre_ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tts_per = %-5d\n", - p->layer_info[i].ts_per); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\terror_ts_packets = %-5d\t", - p->layer_info[i].error_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "total_ts_packets = %-5d\t", - p->layer_info[i].total_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, "ti_ldepth_i = %d\n", - p->layer_info[i].ti_ldepth_i); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\tnumber_of_segments = %d\t", - p->layer_info[i].number_of_segments); - n += scnprintf(&buf[n], PAGE_SIZE - n, "tmcc_errors = %d\n", - p->layer_info[i].tmcc_errors); + n += sysfs_emit_at(buf, n, "\nLayer %d\n", i); + n += sysfs_emit_at(buf, n, "\tcode_rate = %d\t", p->layer_info[i].code_rate); + n += sysfs_emit_at(buf, n, "constellation = %d\n", p->layer_info[i].constellation); + n += sysfs_emit_at(buf, n, "\tber = %-5d\t", p->layer_info[i].ber); + n += sysfs_emit_at(buf, n, "\tber_error_count = %-5d\t", + p->layer_info[i].ber_error_count); + n += sysfs_emit_at(buf, n, "ber_bit_count = %-5d\n", + p->layer_info[i].ber_bit_count); + n += sysfs_emit_at(buf, n, "\tpre_ber = %-5d\t", p->layer_info[i].pre_ber); + n += sysfs_emit_at(buf, n, "\tts_per = %-5d\n", p->layer_info[i].ts_per); + n += sysfs_emit_at(buf, n, "\terror_ts_packets = %-5d\t", + p->layer_info[i].error_ts_packets); + n += sysfs_emit_at(buf, n, "total_ts_packets = %-5d\t", + p->layer_info[i].total_ts_packets); + n += sysfs_emit_at(buf, n, "ti_ldepth_i = %d\n", p->layer_info[i].ti_ldepth_i); + n += sysfs_emit_at(buf, n, "\tnumber_of_segments = %d\t", + p->layer_info[i].number_of_segments); + n += sysfs_emit_at(buf, n, "tmcc_errors = %d\n", p->layer_info[i].tmcc_errors); } debug_data->stats_count = n; @@ -241,80 +171,50 @@ static void smsdvb_print_isdb_stats_ex(struct smsdvb_debugfs *debug_data, buf = debug_data->stats_data; - n += scnprintf(&buf[n], PAGE_SIZE - n, - "statistics_type = %d\t", p->statistics_type); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "full_size = %d\n", p->full_size); - - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_rf_locked = %d\t\t", p->is_rf_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_demod_locked = %d\t", p->is_demod_locked); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "is_external_lna_on = %d\n", p->is_external_lna_on); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "SNR = %d dB\t\t", p->SNR); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "RSSI = %d dBm\t\t", p->RSSI); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "in_band_pwr = %d dBm\n", p->in_band_pwr); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "carrier_offset = %d\t", p->carrier_offset); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "bandwidth = %d\t\t", p->bandwidth); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "frequency = %d Hz\n", p->frequency); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "transmission_mode = %d\t", p->transmission_mode); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "modem_state = %d\t\t", p->modem_state); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "guard_interval = %d\n", p->guard_interval); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "system_type = %d\t\t", p->system_type); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "partial_reception = %d\t", p->partial_reception); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "num_of_layers = %d\n", p->num_of_layers); - n += scnprintf(&buf[n], PAGE_SIZE - n, "segment_number = %d\t", - p->segment_number); - n += scnprintf(&buf[n], PAGE_SIZE - n, "tune_bw = %d\n", - p->tune_bw); + n += sysfs_emit_at(buf, n, "statistics_type = %d\t", p->statistics_type); + n += sysfs_emit_at(buf, n, "full_size = %d\n", p->full_size); + + n += sysfs_emit_at(buf, n, "is_rf_locked = %d\t\t", p->is_rf_locked); + n += sysfs_emit_at(buf, n, "is_demod_locked = %d\t", p->is_demod_locked); + n += sysfs_emit_at(buf, n, "is_external_lna_on = %d\n", p->is_external_lna_on); + n += sysfs_emit_at(buf, n, "SNR = %d dB\t\t", p->SNR); + n += sysfs_emit_at(buf, n, "RSSI = %d dBm\t\t", p->RSSI); + n += sysfs_emit_at(buf, n, "in_band_pwr = %d dBm\n", p->in_band_pwr); + n += sysfs_emit_at(buf, n, "carrier_offset = %d\t", p->carrier_offset); + n += sysfs_emit_at(buf, n, "bandwidth = %d\t\t", p->bandwidth); + n += sysfs_emit_at(buf, n, "frequency = %d Hz\n", p->frequency); + n += sysfs_emit_at(buf, n, "transmission_mode = %d\t", p->transmission_mode); + n += sysfs_emit_at(buf, n, "modem_state = %d\t\t", p->modem_state); + n += sysfs_emit_at(buf, n, "guard_interval = %d\n", p->guard_interval); + n += sysfs_emit_at(buf, n, "system_type = %d\t\t", p->system_type); + n += sysfs_emit_at(buf, n, "partial_reception = %d\t", p->partial_reception); + n += sysfs_emit_at(buf, n, "num_of_layers = %d\n", p->num_of_layers); + n += sysfs_emit_at(buf, n, "segment_number = %d\t", p->segment_number); + n += sysfs_emit_at(buf, n, "tune_bw = %d\n", p->tune_bw); for (i = 0; i < 3; i++) { if (p->layer_info[i].number_of_segments < 1 || p->layer_info[i].number_of_segments > 13) continue; - n += scnprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tcode_rate = %d\t", - p->layer_info[i].code_rate); - n += scnprintf(&buf[n], PAGE_SIZE - n, "constellation = %d\n", - p->layer_info[i].constellation); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tber = %-5d\t", - p->layer_info[i].ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\tber_error_count = %-5d\t", - p->layer_info[i].ber_error_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, "ber_bit_count = %-5d\n", - p->layer_info[i].ber_bit_count); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tpre_ber = %-5d\t", - p->layer_info[i].pre_ber); - n += scnprintf(&buf[n], PAGE_SIZE - n, "\tts_per = %-5d\n", - p->layer_info[i].ts_per); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\terror_ts_packets = %-5d\t", - p->layer_info[i].error_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "total_ts_packets = %-5d\t", - p->layer_info[i].total_ts_packets); - n += scnprintf(&buf[n], PAGE_SIZE - n, "ti_ldepth_i = %d\n", - p->layer_info[i].ti_ldepth_i); - n += scnprintf(&buf[n], PAGE_SIZE - n, - "\tnumber_of_segments = %d\t", - p->layer_info[i].number_of_segments); - n += scnprintf(&buf[n], PAGE_SIZE - n, "tmcc_errors = %d\n", - p->layer_info[i].tmcc_errors); + n += sysfs_emit_at(buf, n, "\nLayer %d\n", i); + n += sysfs_emit_at(buf, n, "\tcode_rate = %d\t", p->layer_info[i].code_rate); + n += sysfs_emit_at(buf, n, "constellation = %d\n", p->layer_info[i].constellation); + n += sysfs_emit_at(buf, n, "\tber = %-5d\t", p->layer_info[i].ber); + n += sysfs_emit_at(buf, n, "\tber_error_count = %-5d\t", + p->layer_info[i].ber_error_count); + n += sysfs_emit_at(buf, n, "ber_bit_count = %-5d\n", + p->layer_info[i].ber_bit_count); + n += sysfs_emit_at(buf, n, "\tpre_ber = %-5d\t", p->layer_info[i].pre_ber); + n += sysfs_emit_at(buf, n, "\tts_per = %-5d\n", p->layer_info[i].ts_per); + n += sysfs_emit_at(buf, n, "\terror_ts_packets = %-5d\t", + p->layer_info[i].error_ts_packets); + n += sysfs_emit_at(buf, n, "total_ts_packets = %-5d\t", + p->layer_info[i].total_ts_packets); + n += sysfs_emit_at(buf, n, "ti_ldepth_i = %d\n", p->layer_info[i].ti_ldepth_i); + n += sysfs_emit_at(buf, n, "\tnumber_of_segments = %d\t", + p->layer_info[i].number_of_segments); + n += sysfs_emit_at(buf, n, "tmcc_errors = %d\n", p->layer_info[i].tmcc_errors); } diff --git a/drivers/media/common/siano/smsendian.c b/drivers/media/common/siano/smsendian.c index 8cb8853a1edb..a3573814919b 100644 --- a/drivers/media/common/siano/smsendian.c +++ b/drivers/media/common/siano/smsendian.c @@ -17,7 +17,7 @@ void smsendian_handle_tx_message(void *buffer) { #ifdef __BIG_ENDIAN - struct sms_msg_data *msg = (struct sms_msg_data *)buffer; + struct sms_msg_data *msg = buffer; int i; int msg_words; |