projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: setup_timer() -> timer_setup()
[linux-block.git]
/
drivers
/
gpu
/
drm
/
i2c
/
tda998x_drv.c
diff --git
a/drivers/gpu/drm/i2c/tda998x_drv.c
b/drivers/gpu/drm/i2c/tda998x_drv.c
index 4d1f45acf2cdbb0be6b0a9a53d55f6af6fbb28c5..127815253a84522b2e7c59f1f1af175a56b46158 100644
(file)
--- a/
drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/
drivers/gpu/drm/i2c/tda998x_drv.c
@@
-601,9
+601,9
@@
tda998x_reset(struct tda998x_priv *priv)
* we have seen a HPD inactive->active transition. This code implements
* that delay.
*/
* we have seen a HPD inactive->active transition. This code implements
* that delay.
*/
-static void tda998x_edid_delay_done(
unsigned long data
)
+static void tda998x_edid_delay_done(
struct timer_list *t
)
{
{
- struct tda998x_priv *priv =
(struct tda998x_priv *)data
;
+ struct tda998x_priv *priv =
from_timer(priv, t, edid_delay_timer)
;
priv->edid_delay_active = false;
wake_up(&priv->edid_delay_waitq);
priv->edid_delay_active = false;
wake_up(&priv->edid_delay_waitq);
@@
-1492,8
+1492,7
@@
static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv)
mutex_init(&priv->mutex); /* protect the page access */
init_waitqueue_head(&priv->edid_delay_waitq);
mutex_init(&priv->mutex); /* protect the page access */
init_waitqueue_head(&priv->edid_delay_waitq);
- setup_timer(&priv->edid_delay_timer, tda998x_edid_delay_done,
- (unsigned long)priv);
+ timer_setup(&priv->edid_delay_timer, tda998x_edid_delay_done, 0);
INIT_WORK(&priv->detect_work, tda998x_detect_work);
/* wake up the device: */
INIT_WORK(&priv->detect_work, tda998x_detect_work);
/* wake up the device: */