diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-26 11:20:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:27:23 -0400 |
commit | 2891f37c261306ae3c3d84775500da3cb9428e33 (patch) | |
tree | 5569cd8c3fcb6f91ddb0a536ad0eac6e475c59a1 /drivers/media/video/ov772x.c | |
parent | 59ca25b7eb8f6675be94ec18beb8eb66293f550d (diff) |
[media] V4L: ov772x: rename macros to not pollute the global namespace
Macros, defined in a header under include/ should be kept in a local
namespace and not pollute the global one.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov772x.c')
-rw-r--r-- | drivers/media/video/ov772x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 397870f076c1..458265b51e3c 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -822,13 +822,13 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height, | |||
822 | goto ov772x_set_fmt_error; | 822 | goto ov772x_set_fmt_error; |
823 | 823 | ||
824 | ret = ov772x_mask_set(client, | 824 | ret = ov772x_mask_set(client, |
825 | EDGE_TRSHLD, EDGE_THRESHOLD_MASK, | 825 | EDGE_TRSHLD, OV772X_EDGE_THRESHOLD_MASK, |
826 | priv->info->edgectrl.threshold); | 826 | priv->info->edgectrl.threshold); |
827 | if (ret < 0) | 827 | if (ret < 0) |
828 | goto ov772x_set_fmt_error; | 828 | goto ov772x_set_fmt_error; |
829 | 829 | ||
830 | ret = ov772x_mask_set(client, | 830 | ret = ov772x_mask_set(client, |
831 | EDGE_STRNGT, EDGE_STRENGTH_MASK, | 831 | EDGE_STRNGT, OV772X_EDGE_STRENGTH_MASK, |
832 | priv->info->edgectrl.strength); | 832 | priv->info->edgectrl.strength); |
833 | if (ret < 0) | 833 | if (ret < 0) |
834 | goto ov772x_set_fmt_error; | 834 | goto ov772x_set_fmt_error; |
@@ -840,13 +840,13 @@ static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height, | |||
840 | * set upper and lower limit | 840 | * set upper and lower limit |
841 | */ | 841 | */ |
842 | ret = ov772x_mask_set(client, | 842 | ret = ov772x_mask_set(client, |
843 | EDGE_UPPER, EDGE_UPPER_MASK, | 843 | EDGE_UPPER, OV772X_EDGE_UPPER_MASK, |
844 | priv->info->edgectrl.upper); | 844 | priv->info->edgectrl.upper); |
845 | if (ret < 0) | 845 | if (ret < 0) |
846 | goto ov772x_set_fmt_error; | 846 | goto ov772x_set_fmt_error; |
847 | 847 | ||
848 | ret = ov772x_mask_set(client, | 848 | ret = ov772x_mask_set(client, |
849 | EDGE_LOWER, EDGE_LOWER_MASK, | 849 | EDGE_LOWER, OV772X_EDGE_LOWER_MASK, |
850 | priv->info->edgectrl.lower); | 850 | priv->info->edgectrl.lower); |
851 | if (ret < 0) | 851 | if (ret < 0) |
852 | goto ov772x_set_fmt_error; | 852 | goto ov772x_set_fmt_error; |