tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: go7007: Refactor Adlink PCI-MPG24 i2c mutex

Browse Source 
Move the lock/unlock to its own function. It makes the code cleaner and
cocci happier.

Fix the following cocci warning:
drivers/media/usb/go7007/go7007-i2c.c:125:1-7: preceding lock on line 61

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Ricardo Ribalda
2024-05-06 21:10:29 +00:00
committed by Hans Verkuil
parent 0b9a0cd686
commit 68879806a5
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/usb/go7007/go7007-i2c.c
+19 -11
View File
@@ -33,7 +33,21 @@
/* There is only one I2C port on the TW2804 that feeds all four GO7007 VIPs
* on the Adlink PCI-MPG24, so access is shared between all of them. */
static DEFINE_MUTEX(adlink_mpg24_i2c_lock);
static DEFINE_MUTEX(adlink_mpg24_i2c_mutex);
static inline void adlink_mpg24_i2c_lock(struct go7007 *go)
{
/* Bridge the I2C port on this GO7007 to the shared bus */
mutex_lock(&adlink_mpg24_i2c_mutex);
go7007_write_addr(go, 0x3c82, 0x0020);
}
static inline void adlink_mpg24_i2c_unlock(struct go7007 *go)
{
/* Isolate the I2C port on this GO7007 from the shared bus */
go7007_write_addr(go, 0x3c82, 0x0000);
mutex_unlock(&adlink_mpg24_i2c_mutex);
}
static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,
u16 command, int flags, u8 *data)
@@ -56,11 +70,8 @@ static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,
mutex_lock(&go->hw_lock);
if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
/* Bridge the I2C port on this GO7007 to the shared bus */
mutex_lock(&adlink_mpg24_i2c_lock);
go7007_write_addr(go, 0x3c82, 0x0020);
}
if (go->board_id == GO7007_BOARDID_ADLINK_MPG24)
adlink_mpg24_i2c_lock(go);
/* Wait for I2C adapter to be ready */
for (i = 0; i < 10; ++i) {
@@ -116,11 +127,8 @@ static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read,
ret = 0;
i2c_done:
if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
/* Isolate the I2C port on this GO7007 from the shared bus */
go7007_write_addr(go, 0x3c82, 0x0000);
mutex_unlock(&adlink_mpg24_i2c_lock);
}
if (go->board_id == GO7007_BOARDID_ADLINK_MPG24)
adlink_mpg24_i2c_unlock(go);
mutex_unlock(&go->hw_lock);
return ret;
}