Commit 4b9fd698 authored by Rehas Sachdeva's avatar Rehas Sachdeva Committed by Greg Kroah-Hartman
Browse files

staging: media: bcm2048: Merge assignment with return 



Instead of storing the return value into a variable and then returning it, we
can club the two into a single return statement. This change was made using
the following semantic patch by Coccinelle:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: default avatarRehas Sachdeva <aquannie@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b72aa8a

drivers/staging/media/bcm2048/radio-bcm2048.c

+4 −10
Original line number Diff line number Diff line
@@ -483,10 +483,8 @@ static int bcm2048_set_rds_no_lock(struct bcm2048_device *bdev, u8 rds_on) 
		memset(&bdev->rds_info, 0, sizeof(bdev->rds_info));

	}



	err = bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,

	return bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_SYSTEM,

				    bdev->cache_fm_rds_system);



	return err;

}



static int bcm2048_get_rds_no_lock(struct bcm2048_device *bdev)
@@ -1834,9 +1832,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);

}



/*
@@ -1995,9 +1991,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)		\