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

[linux-2.6-block.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 0f088405e186418930fdc91925ce5ff223563b6a..4d9bd02ede4700c8a89460ed68b0ce66898d3c26 100644 (file)
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -485,10 +485,8 @@ static int bcm2048_set_rds_no_lock(struct bcm2048_device *bdev, u8 rds_on)
        if (err)
                return err;
 
-       err = bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,
-                                  bdev->cache_fm_rds_system);
-
-       return err;
+       return bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,
+                                   bdev->cache_fm_rds_system);
 }
 
 static int bcm2048_get_rds_no_lock(struct bcm2048_device *bdev)
@@ -1836,9 +1834,7 @@ static int bcm2048_deinit(struct bcm2048_device *bdev)
        if (err < 0)
                return err;
 
-       err = bcm2048_set_power_state(bdev, BCM2048_POWER_OFF);
-
-       return err;
+       return bcm2048_set_power_state(bdev, BCM2048_POWER_OFF);
 }
 
 /*
@@ -1997,9 +1993,7 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,          \
                                                                        \
        value = bcm2048_get_##prop(bdev);                               \
                                                                        \
-       value = sprintf(buf, mask "\n", value);                         \
-                                                                       \
-       return value;                                                   \
+       return sprintf(buf, mask "\n", value);                          \
 }
 
 #define DEFINE_SYSFS_PROPERTY(prop, signal, size, mask, check)         \