diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-09 00:37:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:20 -0500 |
commit | 4ac97914c6c35f6bf132071c718e034d0846b9f5 (patch) | |
tree | 98c7eb827bb8ba99730ed89d32703a30448fd813 /drivers/media/video/tvmixer.c | |
parent | a8900fc242406f25f315190a6d650f1d54617c2f (diff) |
[PATCH] v4l: 800: whitespace cleanups
- Whitespace Cleanups.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/tvmixer.c')
-rw-r--r-- | drivers/media/video/tvmixer.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c index d86e08ebddfc..8318bd1aad00 100644 --- a/drivers/media/video/tvmixer.c +++ b/drivers/media/video/tvmixer.c | |||
@@ -79,7 +79,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm | |||
79 | { | 79 | { |
80 | struct video_audio va; | 80 | struct video_audio va; |
81 | int left,right,ret,val = 0; | 81 | int left,right,ret,val = 0; |
82 | struct TVMIXER *mix = file->private_data; | 82 | struct TVMIXER *mix = file->private_data; |
83 | struct i2c_client *client = mix->dev; | 83 | struct i2c_client *client = mix->dev; |
84 | void __user *argp = (void __user *)arg; | 84 | void __user *argp = (void __user *)arg; |
85 | int __user *p = argp; | 85 | int __user *p = argp; |
@@ -87,25 +87,25 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm | |||
87 | if (NULL == client) | 87 | if (NULL == client) |
88 | return -ENODEV; | 88 | return -ENODEV; |
89 | 89 | ||
90 | if (cmd == SOUND_MIXER_INFO) { | 90 | if (cmd == SOUND_MIXER_INFO) { |
91 | mixer_info info; | 91 | mixer_info info; |
92 | strlcpy(info.id, "tv card", sizeof(info.id)); | 92 | strlcpy(info.id, "tv card", sizeof(info.id)); |
93 | strlcpy(info.name, client->name, sizeof(info.name)); | 93 | strlcpy(info.name, client->name, sizeof(info.name)); |
94 | info.modify_counter = 42 /* FIXME */; | 94 | info.modify_counter = 42 /* FIXME */; |
95 | if (copy_to_user(argp, &info, sizeof(info))) | 95 | if (copy_to_user(argp, &info, sizeof(info))) |
96 | return -EFAULT; | 96 | return -EFAULT; |
97 | return 0; | 97 | return 0; |
98 | } | 98 | } |
99 | if (cmd == SOUND_OLD_MIXER_INFO) { | 99 | if (cmd == SOUND_OLD_MIXER_INFO) { |
100 | _old_mixer_info info; | 100 | _old_mixer_info info; |
101 | strlcpy(info.id, "tv card", sizeof(info.id)); | 101 | strlcpy(info.id, "tv card", sizeof(info.id)); |
102 | strlcpy(info.name, client->name, sizeof(info.name)); | 102 | strlcpy(info.name, client->name, sizeof(info.name)); |
103 | if (copy_to_user(argp, &info, sizeof(info))) | 103 | if (copy_to_user(argp, &info, sizeof(info))) |
104 | return -EFAULT; | 104 | return -EFAULT; |
105 | return 0; | 105 | return 0; |
106 | } | 106 | } |
107 | if (cmd == OSS_GETVERSION) | 107 | if (cmd == OSS_GETVERSION) |
108 | return put_user(SOUND_VERSION, p); | 108 | return put_user(SOUND_VERSION, p); |
109 | 109 | ||
110 | if (_SIOC_DIR(cmd) & _SIOC_WRITE) | 110 | if (_SIOC_DIR(cmd) & _SIOC_WRITE) |
111 | if (get_user(val, p)) | 111 | if (get_user(val, p)) |
@@ -181,8 +181,8 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm | |||
181 | 181 | ||
182 | static int tvmixer_open(struct inode *inode, struct file *file) | 182 | static int tvmixer_open(struct inode *inode, struct file *file) |
183 | { | 183 | { |
184 | int i, minor = iminor(inode); | 184 | int i, minor = iminor(inode); |
185 | struct TVMIXER *mix = NULL; | 185 | struct TVMIXER *mix = NULL; |
186 | struct i2c_client *client = NULL; | 186 | struct i2c_client *client = NULL; |
187 | 187 | ||
188 | for (i = 0; i < DEV_MAX; i++) { | 188 | for (i = 0; i < DEV_MAX; i++) { |
@@ -204,7 +204,7 @@ static int tvmixer_open(struct inode *inode, struct file *file) | |||
204 | #endif | 204 | #endif |
205 | if (client->adapter->owner) | 205 | if (client->adapter->owner) |
206 | try_module_get(client->adapter->owner); | 206 | try_module_get(client->adapter->owner); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | 209 | ||
210 | static int tvmixer_release(struct inode *inode, struct file *file) | 210 | static int tvmixer_release(struct inode *inode, struct file *file) |
@@ -231,15 +231,15 @@ static struct i2c_driver driver = { | |||
231 | .owner = THIS_MODULE, | 231 | .owner = THIS_MODULE, |
232 | #endif | 232 | #endif |
233 | .name = "tv card mixer driver", | 233 | .name = "tv card mixer driver", |
234 | .id = I2C_DRIVERID_TVMIXER, | 234 | .id = I2C_DRIVERID_TVMIXER, |
235 | #ifdef I2C_DF_DUMMY | 235 | #ifdef I2C_DF_DUMMY |
236 | .flags = I2C_DF_DUMMY, | 236 | .flags = I2C_DF_DUMMY, |
237 | #else | 237 | #else |
238 | .flags = I2C_DF_NOTIFY, | 238 | .flags = I2C_DF_NOTIFY, |
239 | .detach_adapter = tvmixer_adapters, | 239 | .detach_adapter = tvmixer_adapters, |
240 | #endif | 240 | #endif |
241 | .attach_adapter = tvmixer_adapters, | 241 | .attach_adapter = tvmixer_adapters, |
242 | .detach_client = tvmixer_clients, | 242 | .detach_client = tvmixer_clients, |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static struct file_operations tvmixer_fops = { | 245 | static struct file_operations tvmixer_fops = { |