Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
45dbf0db
Commit
45dbf0db
authored
Sep 23, 2011
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[media] tm6000: Fix some CodingStyle issues
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
parent
3a7a6237
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
24 deletions
+24
-24
drivers/staging/tm6000/tm6000-core.c
drivers/staging/tm6000/tm6000-core.c
+10
-10
drivers/staging/tm6000/tm6000-dvb.c
drivers/staging/tm6000/tm6000-dvb.c
+2
-2
drivers/staging/tm6000/tm6000-i2c.c
drivers/staging/tm6000/tm6000-i2c.c
+8
-8
drivers/staging/tm6000/tm6000-regs.h
drivers/staging/tm6000/tm6000-regs.h
+1
-1
drivers/staging/tm6000/tm6000-usb-isoc.h
drivers/staging/tm6000/tm6000-usb-isoc.h
+1
-1
drivers/staging/tm6000/tm6000.h
drivers/staging/tm6000/tm6000.h
+2
-2
No files found.
drivers/staging/tm6000/tm6000-core.c
View file @
45dbf0db
...
...
@@ -52,18 +52,18 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
}
if
(
tm6000_debug
&
V4L2_DEBUG_I2C
)
{
printk
(
"(dev %p, pipe %08x): "
,
dev
->
udev
,
pipe
);
printk
(
KERN_DEBUG
"(dev %p, pipe %08x): "
,
dev
->
udev
,
pipe
);
printk
(
"%s: %02x %02x %02x %02x %02x %02x %02x %02x "
,
printk
(
KERN_CONT
"%s: %02x %02x %02x %02x %02x %02x %02x %02x "
,
(
req_type
&
USB_DIR_IN
)
?
" IN"
:
"OUT"
,
req_type
,
req
,
value
&
0xff
,
value
>>
8
,
index
&
0xff
,
index
>>
8
,
len
&
0xff
,
len
>>
8
);
if
(
!
(
req_type
&
USB_DIR_IN
))
{
printk
(
">>> "
);
printk
(
KERN_CONT
">>> "
);
for
(
i
=
0
;
i
<
len
;
i
++
)
printk
(
" %02x"
,
buf
[
i
]);
printk
(
"
\n
"
);
printk
(
KERN_CONT
" %02x"
,
buf
[
i
]);
printk
(
KERN_CONT
"
\n
"
);
}
}
...
...
@@ -76,14 +76,14 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
if
(
tm6000_debug
&
V4L2_DEBUG_I2C
)
{
if
(
ret
<
0
)
{
if
(
req_type
&
USB_DIR_IN
)
printk
(
"<<< (len=%d)
\n
"
,
len
);
printk
(
KERN_DEBUG
"<<< (len=%d)
\n
"
,
len
);
printk
(
"%s: Error #%d
\n
"
,
__FUNCTION
__
,
ret
);
printk
(
KERN_CONT
"%s: Error #%d
\n
"
,
__func
__
,
ret
);
}
else
if
(
req_type
&
USB_DIR_IN
)
{
printk
(
"<<< "
);
printk
(
KERN_CONT
"<<< "
);
for
(
i
=
0
;
i
<
len
;
i
++
)
printk
(
" %02x"
,
buf
[
i
]);
printk
(
"
\n
"
);
printk
(
KERN_CONT
" %02x"
,
buf
[
i
]);
printk
(
KERN_CONT
"
\n
"
);
}
}
...
...
drivers/staging/tm6000/tm6000-dvb.c
View file @
45dbf0db
...
...
@@ -330,7 +330,7 @@ static int register_dvb(struct tm6000_core *dev)
dvb
->
demux
.
write_to_decoder
=
NULL
;
ret
=
dvb_dmx_init
(
&
dvb
->
demux
);
if
(
ret
<
0
)
{
printk
(
"tm6000: dvb_dmx_init failed (errno = %d)
\n
"
,
ret
);
printk
(
KERN_ERR
"tm6000: dvb_dmx_init failed (errno = %d)
\n
"
,
ret
);
goto
frontend_err
;
}
...
...
@@ -340,7 +340,7 @@ static int register_dvb(struct tm6000_core *dev)
ret
=
dvb_dmxdev_init
(
&
dvb
->
dmxdev
,
&
dvb
->
adapter
);
if
(
ret
<
0
)
{
printk
(
"tm6000: dvb_dmxdev_init failed (errno = %d)
\n
"
,
ret
);
printk
(
KERN_ERR
"tm6000: dvb_dmxdev_init failed (errno = %d)
\n
"
,
ret
);
goto
dvb_dmx_err
;
}
...
...
drivers/staging/tm6000/tm6000-i2c.c
View file @
45dbf0db
...
...
@@ -189,7 +189,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
/* 1 or 2 byte write followed by a read */
if
(
i2c_debug
>=
2
)
for
(
byte
=
0
;
byte
<
msgs
[
i
].
len
;
byte
++
)
printk
(
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
printk
(
KERN_CONT
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
i2c_dprintk
(
2
,
"; joined to read %s len=%d:"
,
i
==
num
-
2
?
"stop"
:
"nonstop"
,
msgs
[
i
+
1
].
len
);
...
...
@@ -211,17 +211,17 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
}
if
(
i2c_debug
>=
2
)
for
(
byte
=
0
;
byte
<
msgs
[
i
].
len
;
byte
++
)
printk
(
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
printk
(
KERN_CONT
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
}
else
{
/* write bytes */
if
(
i2c_debug
>=
2
)
for
(
byte
=
0
;
byte
<
msgs
[
i
].
len
;
byte
++
)
printk
(
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
printk
(
KERN_CONT
" %02x"
,
msgs
[
i
].
buf
[
byte
]);
rc
=
tm6000_i2c_send_regs
(
dev
,
addr
,
msgs
[
i
].
buf
[
0
],
msgs
[
i
].
buf
+
1
,
msgs
[
i
].
len
-
1
);
}
if
(
i2c_debug
>=
2
)
printk
(
"
\n
"
);
printk
(
KERN_CONT
"
\n
"
);
if
(
rc
<
0
)
goto
err
;
}
...
...
@@ -259,7 +259,7 @@ static int tm6000_i2c_eeprom(struct tm6000_core *dev)
p
++
;
if
(
0
==
(
i
%
16
))
printk
(
KERN_INFO
"%s: i2c eeprom %02x:"
,
dev
->
name
,
i
);
printk
(
" %02x"
,
dev
->
eedata
[
i
]);
printk
(
KERN_CONT
" %02x"
,
dev
->
eedata
[
i
]);
if
((
dev
->
eedata
[
i
]
>=
' '
)
&&
(
dev
->
eedata
[
i
]
<=
'z'
))
bytes
[
i
%
16
]
=
dev
->
eedata
[
i
];
else
...
...
@@ -269,14 +269,14 @@ static int tm6000_i2c_eeprom(struct tm6000_core *dev)
if
(
0
==
(
i
%
16
))
{
bytes
[
16
]
=
'\0'
;
printk
(
" %s
\n
"
,
bytes
);
printk
(
KERN_CONT
" %s
\n
"
,
bytes
);
}
}
if
(
0
!=
(
i
%
16
))
{
bytes
[
i
%
16
]
=
'\0'
;
for
(
i
%=
16
;
i
<
16
;
i
++
)
printk
(
" "
);
printk
(
" %s
\n
"
,
bytes
);
printk
(
KERN_CONT
" "
);
printk
(
KERN_CONT
" %s
\n
"
,
bytes
);
}
return
0
;
...
...
drivers/staging/tm6000/tm6000-regs.h
View file @
45dbf0db
...
...
@@ -90,7 +90,7 @@
*/
enum
{
TM6000_URB_MSG_VIDEO
=
1
,
TM6000_URB_MSG_VIDEO
=
1
,
TM6000_URB_MSG_AUDIO
,
TM6000_URB_MSG_VBI
,
TM6000_URB_MSG_PTS
,
...
...
drivers/staging/tm6000/tm6000-usb-isoc.h
View file @
45dbf0db
...
...
@@ -46,5 +46,5 @@ struct usb_isoc_ctl {
int
tmp_buf_len
;
/* Stores already requested buffers */
struct
tm6000_buffer
*
buf
;
struct
tm6000_buffer
*
buf
;
};
drivers/staging/tm6000/tm6000.h
View file @
45dbf0db
...
...
@@ -384,7 +384,7 @@ extern int tm6000_debug;
#define dprintk(dev, level, fmt, arg...) do {\
if (tm6000_debug & level) \
printk(KERN_INFO "(%lu) %s %s :"fmt, jiffies, \
dev->name, __
FUNCTION
__ , ##arg); } while (0)
dev->name, __
func
__ , ##arg); } while (0)
#define V4L2_DEBUG_REG 0x0004
#define V4L2_DEBUG_I2C 0x0008
...
...
@@ -395,4 +395,4 @@ extern int tm6000_debug;
#define tm6000_err(fmt, arg...) do {\
printk(KERN_ERR "tm6000 %s :"fmt, \
__
FUNCTION
__ , ##arg); } while (0)
__
func
__ , ##arg); } while (0)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment