shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: media: rc: Convert timers to use timer_setup()

Browse Source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: "Antti Seppälä" <a.seppala@gmail.com>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: "David Härdeman" <david@hardeman.nu>
Cc: Andi Shyti <andi.shyti@samsung.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
(cherry picked from commit b17ec78a42)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>

 Conflicts:
	drivers/media/rc/imon.c
	drivers/media/rc/sir_ir.c
This commit is contained in:
Kees Cook
2017-10-24 11:23:14 -04:00
committed by Tao Huang
parent a38d8fc1eb
commit db2b14aac4
7 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/rc/ene_ir.c
View File

@@ -675,9 +675,9 @@ exit:
}
/* timer to simulate tx done interrupt */
static void ene_tx_irqsim(unsigned long data)
static void ene_tx_irqsim(struct timer_list *t)
{
struct ene_device *dev = (struct ene_device *)data;
struct ene_device *dev = from_timer(dev, t, tx_sim_timer);
unsigned long flags;
spin_lock_irqsave(&dev->hw_lock, flags);
@@ -1050,8 +1050,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
if (!dev->hw_learning_and_tx_capable && txsim) {
dev->hw_learning_and_tx_capable = true;
setup_timer(&dev->tx_sim_timer, ene_tx_irqsim,
(long unsigned int)dev);
timer_setup(&dev->tx_sim_timer, ene_tx_irqsim, 0);
pr_warn("Simulation of TX activated\n");
}

6
drivers/media/rc/igorplugusb.c
View File

@@ -137,9 +137,9 @@ static void igorplugusb_cmd(struct igorplugusb *ir, int cmd)
dev_err(ir->dev, "submit urb failed: %d", ret);
}
static void igorplugusb_timer(unsigned long data)
static void igorplugusb_timer(struct timer_list *t)
{
struct igorplugusb *ir = (struct igorplugusb *)data;
struct igorplugusb *ir = from_timer(ir, t, timer);
igorplugusb_cmd(ir, GET_INFRACODE);
}
@@ -174,7 +174,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
ir->dev = &intf->dev;
setup_timer(&ir->timer, igorplugusb_timer, (unsigned long)ir);
timer_setup(&ir->timer, igorplugusb_timer, 0);
ir->request.bRequest = GET_INFRACODE;
ir->request.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN;

13
drivers/media/rc/img-ir/img-ir-hw.c
View File

@@ -871,9 +871,9 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
}
/* timer function to end waiting for repeat. */
static void img_ir_end_timer(unsigned long arg)
static void img_ir_end_timer(struct timer_list *t)
{
struct img_ir_priv *priv = (struct img_ir_priv *)arg;
struct img_ir_priv *priv = from_timer(priv, t, hw.end_timer);
spin_lock_irq(&priv->lock);
img_ir_end_repeat(priv);
@@ -885,9 +885,9 @@ static void img_ir_end_timer(unsigned long arg)
* cleared when invalid interrupts were generated due to a quirk in the
* img-ir decoder.
*/
static void img_ir_suspend_timer(unsigned long arg)
static void img_ir_suspend_timer(struct timer_list *t)
{
struct img_ir_priv *priv = (struct img_ir_priv *)arg;
struct img_ir_priv *priv = from_timer(priv, t, hw.suspend_timer);
spin_lock_irq(&priv->lock);
/*
@@ -1059,9 +1059,8 @@ int img_ir_probe_hw(struct img_ir_priv *priv)
img_ir_probe_hw_caps(priv);
/* Set up the end timer */
setup_timer(&hw->end_timer, img_ir_end_timer, (unsigned long)priv);
setup_timer(&hw->suspend_timer, img_ir_suspend_timer,
(unsigned long)priv);
timer_setup(&hw->end_timer, img_ir_end_timer, 0);
timer_setup(&hw->suspend_timer, img_ir_suspend_timer, 0);
/* Register a clock notifier */
if (!IS_ERR(priv->clk)) {

6
drivers/media/rc/img-ir/img-ir-raw.c
View File

@@ -67,9 +67,9 @@ void img_ir_isr_raw(struct img_ir_priv *priv, u32 irq_status)
* order to be assured of the final space. If there are no edges for a certain
* time we use this timer to emit a final sample to satisfy them.
*/
static void img_ir_echo_timer(unsigned long arg)
static void img_ir_echo_timer(struct timer_list *t)
{
struct img_ir_priv *priv = (struct img_ir_priv *)arg;
struct img_ir_priv *priv = from_timer(priv, t, raw.timer);
spin_lock_irq(&priv->lock);
@@ -107,7 +107,7 @@ int img_ir_probe_raw(struct img_ir_priv *priv)
int error;
/* Set up the echo timer */
setup_timer(&raw->timer, img_ir_echo_timer, (unsigned long)priv);
timer_setup(&raw->timer, img_ir_echo_timer, 0);
/* Allocate raw decoder */
raw->rdev = rdev = rc_allocate_device(RC_DRIVER_IR_RAW);

7
drivers/media/rc/ir-mce_kbd-decoder.c
View File

@@ -115,9 +115,9 @@ static unsigned char kbd_keycodes[256] = {
KEY_RESERVED
};
static void mce_kbd_rx_timeout(unsigned long data)
static void mce_kbd_rx_timeout(struct timer_list *t)
{
struct mce_kbd_dec *mce_kbd = (struct mce_kbd_dec *)data;
struct mce_kbd_dec *mce_kbd = from_timer(mce_kbd, t, rx_timeout);
int i;
unsigned char maskcode;
@@ -391,8 +391,7 @@ static int ir_mce_kbd_register(struct rc_dev *dev)
set_bit(EV_MSC, idev->evbit);
set_bit(MSC_SCAN, idev->mscbit);
setup_timer(&mce_kbd->rx_timeout, mce_kbd_rx_timeout,
(unsigned long)mce_kbd);
timer_setup(&mce_kbd->rx_timeout, mce_kbd_rx_timeout, 0);
input_set_drvdata(idev, mce_kbd);

8
drivers/media/rc/rc-ir-raw.c
View File

@@ -474,9 +474,10 @@ int ir_raw_encode_scancode(enum rc_proto protocol, u32 scancode,
}
EXPORT_SYMBOL(ir_raw_encode_scancode);
static void edge_handle(unsigned long arg)
static void edge_handle(struct timer_list *t)
{
struct rc_dev *dev = (struct rc_dev *)arg;
struct ir_raw_event_ctrl *raw = from_timer(raw, t, edge_handle);
struct rc_dev *dev = raw->dev;
ktime_t interval = ktime_sub(ktime_get(), dev->raw->last_event);
if (ktime_to_ns(interval) >= dev->timeout) {
@@ -539,8 +540,7 @@ int ir_raw_event_prepare(struct rc_dev *dev)
dev->raw->dev = dev;
dev->change_protocol = change_protocol;
setup_timer(&dev->raw->edge_handle, edge_handle,
(unsigned long)dev);
timer_setup(&dev->raw->edge_handle, edge_handle, 0);
INIT_KFIFO(dev->raw->kfifo);
return 0;

7
drivers/media/rc/rc-main.c
View File

@@ -629,9 +629,9 @@ EXPORT_SYMBOL_GPL(rc_keyup);
* This routine will generate a keyup event some time after a keydown event
* is generated when no further activity has been detected.
*/
static void ir_timer_keyup(unsigned long cookie)
static void ir_timer_keyup(struct timer_list *t)
{
struct rc_dev *dev = (struct rc_dev *)cookie;
struct rc_dev *dev = from_timer(dev, t, timer_keyup);
unsigned long flags;
/*
@@ -1597,8 +1597,7 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
dev->input_dev->setkeycode = ir_setkeycode;
input_set_drvdata(dev->input_dev, dev);
setup_timer(&dev->timer_keyup, ir_timer_keyup,
(unsigned long)dev);
timer_setup(&dev->timer_keyup, ir_timer_keyup, 0);
spin_lock_init(&dev->rc_map.lock);
spin_lock_init(&dev->keylock);