Merge tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-zesty-kernel.git] / drivers / staging / media / bcm2048 / radio-bcm2048.c

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index c5116c058cea26c9e3677a843e54b952ff673be2..37bd439ee08bba4ad8e24c6c3bf7cff66434be63 100644 (file)
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -17,10 +17,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
  */
 
 /*
@@ -999,7 +995,7 @@ static int bcm2048_set_fm_search_tune_mode(struct bcm2048_device *bdev,
                timeout = BCM2048_AUTO_SEARCH_TIMEOUT;
 
        if (!wait_for_completion_timeout(&bdev->compl,
-               msecs_to_jiffies(timeout)))
+                                        msecs_to_jiffies(timeout)))
                dev_err(&bdev->client->dev, "IRQ timeout.\n");
 
        if (value)
@@ -2059,67 +2055,67 @@ property_signed_read(fm_rssi, int, "%d")
 DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
 
 static struct device_attribute attrs[] = {
-       __ATTR(power_state, S_IRUGO | S_IWUSR, bcm2048_power_state_read,
+       __ATTR(power_state, 0644, bcm2048_power_state_read,
               bcm2048_power_state_write),
-       __ATTR(mute, S_IRUGO | S_IWUSR, bcm2048_mute_read,
+       __ATTR(mute, 0644, bcm2048_mute_read,
               bcm2048_mute_write),
-       __ATTR(audio_route, S_IRUGO | S_IWUSR, bcm2048_audio_route_read,
+       __ATTR(audio_route, 0644, bcm2048_audio_route_read,
               bcm2048_audio_route_write),
-       __ATTR(dac_output, S_IRUGO | S_IWUSR, bcm2048_dac_output_read,
+       __ATTR(dac_output, 0644, bcm2048_dac_output_read,
               bcm2048_dac_output_write),
-       __ATTR(fm_hi_lo_injection, S_IRUGO | S_IWUSR,
+       __ATTR(fm_hi_lo_injection, 0644,
               bcm2048_fm_hi_lo_injection_read,
               bcm2048_fm_hi_lo_injection_write),
-       __ATTR(fm_frequency, S_IRUGO | S_IWUSR, bcm2048_fm_frequency_read,
+       __ATTR(fm_frequency, 0644, bcm2048_fm_frequency_read,
               bcm2048_fm_frequency_write),
-       __ATTR(fm_af_frequency, S_IRUGO | S_IWUSR,
+       __ATTR(fm_af_frequency, 0644,
               bcm2048_fm_af_frequency_read,
               bcm2048_fm_af_frequency_write),
-       __ATTR(fm_deemphasis, S_IRUGO | S_IWUSR, bcm2048_fm_deemphasis_read,
+       __ATTR(fm_deemphasis, 0644, bcm2048_fm_deemphasis_read,
               bcm2048_fm_deemphasis_write),
-       __ATTR(fm_rds_mask, S_IRUGO | S_IWUSR, bcm2048_fm_rds_mask_read,
+       __ATTR(fm_rds_mask, 0644, bcm2048_fm_rds_mask_read,
               bcm2048_fm_rds_mask_write),
-       __ATTR(fm_best_tune_mode, S_IRUGO | S_IWUSR,
+       __ATTR(fm_best_tune_mode, 0644,
               bcm2048_fm_best_tune_mode_read,
               bcm2048_fm_best_tune_mode_write),
-       __ATTR(fm_search_rssi_threshold, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_rssi_threshold, 0644,
               bcm2048_fm_search_rssi_threshold_read,
               bcm2048_fm_search_rssi_threshold_write),
-       __ATTR(fm_search_mode_direction, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_mode_direction, 0644,
               bcm2048_fm_search_mode_direction_read,
               bcm2048_fm_search_mode_direction_write),
-       __ATTR(fm_search_tune_mode, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_tune_mode, 0644,
               bcm2048_fm_search_tune_mode_read,
               bcm2048_fm_search_tune_mode_write),
-       __ATTR(rds, S_IRUGO | S_IWUSR, bcm2048_rds_read,
+       __ATTR(rds, 0644, bcm2048_rds_read,
               bcm2048_rds_write),
-       __ATTR(rds_b_block_mask, S_IRUGO | S_IWUSR,
+       __ATTR(rds_b_block_mask, 0644,
               bcm2048_rds_b_block_mask_read,
               bcm2048_rds_b_block_mask_write),
-       __ATTR(rds_b_block_match, S_IRUGO | S_IWUSR,
+       __ATTR(rds_b_block_match, 0644,
               bcm2048_rds_b_block_match_read,
               bcm2048_rds_b_block_match_write),
-       __ATTR(rds_pi_mask, S_IRUGO | S_IWUSR, bcm2048_rds_pi_mask_read,
+       __ATTR(rds_pi_mask, 0644, bcm2048_rds_pi_mask_read,
               bcm2048_rds_pi_mask_write),
-       __ATTR(rds_pi_match, S_IRUGO | S_IWUSR, bcm2048_rds_pi_match_read,
+       __ATTR(rds_pi_match, 0644, bcm2048_rds_pi_match_read,
               bcm2048_rds_pi_match_write),
-       __ATTR(rds_wline, S_IRUGO | S_IWUSR, bcm2048_rds_wline_read,
+       __ATTR(rds_wline, 0644, bcm2048_rds_wline_read,
               bcm2048_rds_wline_write),
-       __ATTR(rds_pi, S_IRUGO, bcm2048_rds_pi_read, NULL),
-       __ATTR(rds_rt, S_IRUGO, bcm2048_rds_rt_read, NULL),
-       __ATTR(rds_ps, S_IRUGO, bcm2048_rds_ps_read, NULL),
-       __ATTR(fm_rds_flags, S_IRUGO, bcm2048_fm_rds_flags_read, NULL),
-       __ATTR(region_bottom_frequency, S_IRUGO,
+       __ATTR(rds_pi, 0444, bcm2048_rds_pi_read, NULL),
+       __ATTR(rds_rt, 0444, bcm2048_rds_rt_read, NULL),
+       __ATTR(rds_ps, 0444, bcm2048_rds_ps_read, NULL),
+       __ATTR(fm_rds_flags, 0444, bcm2048_fm_rds_flags_read, NULL),
+       __ATTR(region_bottom_frequency, 0444,
               bcm2048_region_bottom_frequency_read, NULL),
-       __ATTR(region_top_frequency, S_IRUGO,
+       __ATTR(region_top_frequency, 0444,
               bcm2048_region_top_frequency_read, NULL),
-       __ATTR(fm_carrier_error, S_IRUGO,
+       __ATTR(fm_carrier_error, 0444,
               bcm2048_fm_carrier_error_read, NULL),
-       __ATTR(fm_rssi, S_IRUGO,
+       __ATTR(fm_rssi, 0444,
               bcm2048_fm_rssi_read, NULL),
-       __ATTR(region, S_IRUGO | S_IWUSR, bcm2048_region_read,
+       __ATTR(region, 0644, bcm2048_region_read,
               bcm2048_region_write),
-       __ATTR(rds_data, S_IRUGO, bcm2048_rds_data_read, NULL),
+       __ATTR(rds_data, 0444, bcm2048_rds_data_read, NULL),
 };
 
 static int bcm2048_sysfs_unregister_properties(struct bcm2048_device *bdev,
@@ -2204,7 +2200,7 @@ static ssize_t bcm2048_fops_read(struct file *file, char __user *buf,
                }
                /* interruptible_sleep_on(&bdev->read_queue); */
                if (wait_event_interruptible(bdev->read_queue,
-                   bdev->rds_data_available) < 0) {
+                                            bdev->rds_data_available) < 0) {
                        retval = -EINTR;
                        goto done;
                }