* [PATCH] ambassador: use setup_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
@ 2017-03-11 0:46 ` Geliang Tang
2017-03-13 6:47 ` David Miller
2017-03-11 0:46 ` [PATCH] auxdisplay: " Geliang Tang
` (7 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:46 UTC (permalink / raw)
To: Chas Williams; +Cc: Geliang Tang, linux-atm-general, netdev, linux-kernel
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
drivers/atm/ambassador.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 4a61079..906705e 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2267,9 +2267,8 @@ static int amb_probe(struct pci_dev *pci_dev,
dev->atm_dev->ci_range.vpi_bits = NUM_VPI_BITS;
dev->atm_dev->ci_range.vci_bits = NUM_VCI_BITS;
- init_timer(&dev->housekeeping);
- dev->housekeeping.function = do_housekeeping;
- dev->housekeeping.data = (unsigned long) dev;
+ setup_timer(&dev->housekeeping, do_housekeeping,
+ (unsigned long)dev);
mod_timer(&dev->housekeeping, jiffies);
// enable host interrupts
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH] auxdisplay: use setup_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
2017-03-11 0:46 ` [PATCH] ambassador: use setup_timer Geliang Tang
@ 2017-03-11 0:46 ` Geliang Tang
2017-03-13 17:27 ` Paul Burton
2017-03-11 0:46 ` [PATCH] Bluetooth: bluecard: " Geliang Tang
` (6 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:46 UTC (permalink / raw)
To: Paul Burton, Miguel Ojeda Sandonis; +Cc: Geliang Tang, linux-kernel
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
drivers/auxdisplay/img-ascii-lcd.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index bf43b5d..1f30b7e 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -393,9 +393,7 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
ctx->scroll_rate = HZ / 2;
/* initialise a timer for scrolling the message */
- init_timer(&ctx->timer);
- ctx->timer.function = img_ascii_lcd_scroll;
- ctx->timer.data = (unsigned long)ctx;
+ setup_timer(&ctx->timer, img_ascii_lcd_scroll, (unsigned long)ctx);
platform_set_drvdata(pdev, ctx);
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] auxdisplay: use setup_timer
2017-03-11 0:46 ` [PATCH] auxdisplay: " Geliang Tang
@ 2017-03-13 17:27 ` Paul Burton
0 siblings, 0 replies; 16+ messages in thread
From: Paul Burton @ 2017-03-13 17:27 UTC (permalink / raw)
To: Geliang Tang
Cc: Miguel Ojeda Sandonis, linux-kernel, Ralf Baechle, Andrew Morton,
trivial
[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]
Hi Geliang,
On Friday, 10 March 2017 16:46:57 PDT Geliang Tang wrote:
> Use setup_timer() instead of init_timer() to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> drivers/auxdisplay/img-ascii-lcd.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/auxdisplay/img-ascii-lcd.c
> b/drivers/auxdisplay/img-ascii-lcd.c index bf43b5d..1f30b7e 100644
> --- a/drivers/auxdisplay/img-ascii-lcd.c
> +++ b/drivers/auxdisplay/img-ascii-lcd.c
> @@ -393,9 +393,7 @@ static int img_ascii_lcd_probe(struct platform_device
> *pdev) ctx->scroll_rate = HZ / 2;
>
> /* initialise a timer for scrolling the message */
> - init_timer(&ctx->timer);
> - ctx->timer.function = img_ascii_lcd_scroll;
> - ctx->timer.data = (unsigned long)ctx;
> + setup_timer(&ctx->timer, img_ascii_lcd_scroll, (unsigned long)ctx);
>
> platform_set_drvdata(pdev, ctx);
Thanks for the patch:
Reviewed-by: Paul Burton <paul.burton@imgtec.com>
I've CC'd Ralf & Andrew since a couple of other patches to this driver have
been waiting for someone to merge them for a while, and whilst it's unclear
which path those patches & this one should take into mainline they've been
suggested so far (besides Miguel who seems not to be active).
I've also CC'd the trivial patch monkey in case this can get in through that
route, though I'm unsure whether CC'ing on a reply is sufficient so you might
like to resend with trivial@kernel.org CC'd on the patch.
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] Bluetooth: bluecard: use setup_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
2017-03-11 0:46 ` [PATCH] ambassador: use setup_timer Geliang Tang
2017-03-11 0:46 ` [PATCH] auxdisplay: " Geliang Tang
@ 2017-03-11 0:46 ` Geliang Tang
2017-03-27 14:11 ` Marcel Holtmann
2017-03-11 0:46 ` [PATCH] drop_monitor: " Geliang Tang
` (5 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:46 UTC (permalink / raw)
To: Marcel Holtmann, Gustavo Padovan, Johan Hedberg
Cc: Geliang Tang, linux-bluetooth, linux-kernel
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
drivers/bluetooth/bluecard_cs.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index c0b3b55..007c0a4 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -695,9 +695,8 @@ static int bluecard_open(struct bluecard_info *info)
spin_lock_init(&(info->lock));
- init_timer(&(info->timer));
- info->timer.function = &bluecard_activity_led_timeout;
- info->timer.data = (u_long)info;
+ setup_timer(&(info->timer), &bluecard_activity_led_timeout,
+ (u_long)info);
skb_queue_head_init(&(info->txq));
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Bluetooth: bluecard: use setup_timer
2017-03-11 0:46 ` [PATCH] Bluetooth: bluecard: " Geliang Tang
@ 2017-03-27 14:11 ` Marcel Holtmann
0 siblings, 0 replies; 16+ messages in thread
From: Marcel Holtmann @ 2017-03-27 14:11 UTC (permalink / raw)
To: Geliang Tang
Cc: Gustavo F. Padovan, Johan Hedberg, linux-bluetooth, linux-kernel
Hi Geliang,
> Use setup_timer() instead of init_timer() to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> drivers/bluetooth/bluecard_cs.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] drop_monitor: use setup_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (2 preceding siblings ...)
2017-03-11 0:46 ` [PATCH] Bluetooth: bluecard: " Geliang Tang
@ 2017-03-11 0:46 ` Geliang Tang
2017-03-13 6:47 ` David Miller
2017-03-11 0:47 ` [PATCH] fs/ocfs2/cluster: " Geliang Tang
` (4 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:46 UTC (permalink / raw)
To: Neil Horman, David S. Miller; +Cc: Geliang Tang, netdev, linux-kernel
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
net/core/drop_monitor.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index fb55327..70ccda2 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -412,9 +412,8 @@ static int __init init_net_drop_monitor(void)
for_each_possible_cpu(cpu) {
data = &per_cpu(dm_cpu_data, cpu);
INIT_WORK(&data->dm_alert_work, send_dm_alert);
- init_timer(&data->send_timer);
- data->send_timer.data = (unsigned long)data;
- data->send_timer.function = sched_send_work;
+ setup_timer(&data->send_timer, sched_send_work,
+ (unsigned long)data);
spin_lock_init(&data->lock);
reset_per_cpu_data(data);
}
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH] fs/ocfs2/cluster: use setup_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (3 preceding siblings ...)
2017-03-11 0:46 ` [PATCH] drop_monitor: " Geliang Tang
@ 2017-03-11 0:47 ` Geliang Tang
2017-03-11 0:47 ` [PATCH] libata: use setup_deferrable_timer Geliang Tang
` (3 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:47 UTC (permalink / raw)
To: Mark Fasheh, Joel Becker, Andrew Morton
Cc: Geliang Tang, ocfs2-devel, linux-kernel
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
fs/ocfs2/cluster/tcp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 4348027..de51b23 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -450,9 +450,8 @@ static struct o2net_sock_container *sc_alloc(struct o2nm_node *node)
INIT_WORK(&sc->sc_shutdown_work, o2net_shutdown_sc);
INIT_DELAYED_WORK(&sc->sc_keepalive_work, o2net_sc_send_keep_req);
- init_timer(&sc->sc_idle_timeout);
- sc->sc_idle_timeout.function = o2net_idle_timer;
- sc->sc_idle_timeout.data = (unsigned long)sc;
+ setup_timer(&sc->sc_idle_timeout, o2net_idle_timer,
+ (unsigned long)sc);
sclog(sc, "alloced\n");
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH] libata: use setup_deferrable_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (4 preceding siblings ...)
2017-03-11 0:47 ` [PATCH] fs/ocfs2/cluster: " Geliang Tang
@ 2017-03-11 0:47 ` Geliang Tang
2017-03-13 17:07 ` Tejun Heo
2017-03-14 18:06 ` [PATCH] ACPI / APEI: " Baicar, Tyler
` (2 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Geliang Tang @ 2017-03-11 0:47 UTC (permalink / raw)
To: Tejun Heo; +Cc: Geliang Tang, linux-ide, linux-kernel
Use setup_deferrable_timer() instead of init_timer_deferrable() to
simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
drivers/ata/libata-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ca75823..55d3c8b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5902,9 +5902,9 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
INIT_LIST_HEAD(&ap->eh_done_q);
init_waitqueue_head(&ap->eh_wait_q);
init_completion(&ap->park_req_pending);
- init_timer_deferrable(&ap->fastdrain_timer);
- ap->fastdrain_timer.function = ata_eh_fastdrain_timerfn;
- ap->fastdrain_timer.data = (unsigned long)ap;
+ setup_deferrable_timer(&ap->fastdrain_timer,
+ ata_eh_fastdrain_timerfn,
+ (unsigned long)ap);
ap->cbl = ATA_CBL_NONE;
--
2.9.3
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] ACPI / APEI: use setup_deferrable_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (5 preceding siblings ...)
2017-03-11 0:47 ` [PATCH] libata: use setup_deferrable_timer Geliang Tang
@ 2017-03-14 18:06 ` Baicar, Tyler
2017-04-18 14:41 ` Rafael J. Wysocki
2017-04-19 10:09 ` [tip:ras/core] ACPI/APEI: Use setup_deferrable_timer() tip-bot for Geliang Tang
8 siblings, 0 replies; 16+ messages in thread
From: Baicar, Tyler @ 2017-03-14 18:06 UTC (permalink / raw)
To: Geliang Tang, Rafael J. Wysocki, Len Brown, Borislav Petkov
Cc: linux-acpi, linux-kernel
Works for me!
On 3/10/2017 5:46 PM, Geliang Tang wrote:
> Use setup_deferrable_timer() instead of init_timer_deferrable() to
> simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Tested-by: Tyler Baicar <tbaicar@codeaurora.org>
> ---
> drivers/acpi/apei/ghes.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index b192b42..33ca196 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -1005,9 +1005,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
>
> switch (generic->notify.type) {
> case ACPI_HEST_NOTIFY_POLLED:
> - ghes->timer.function = ghes_poll_func;
> - ghes->timer.data = (unsigned long)ghes;
> - init_timer_deferrable(&ghes->timer);
> + setup_deferrable_timer(&ghes->timer, ghes_poll_func,
> + (unsigned long)ghes);
> ghes_add_timer(ghes);
> break;
> case ACPI_HEST_NOTIFY_EXTERNAL:
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] ACPI / APEI: use setup_deferrable_timer
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (6 preceding siblings ...)
2017-03-14 18:06 ` [PATCH] ACPI / APEI: " Baicar, Tyler
@ 2017-04-18 14:41 ` Rafael J. Wysocki
2017-04-18 17:21 ` Borislav Petkov
2017-04-19 10:09 ` [tip:ras/core] ACPI/APEI: Use setup_deferrable_timer() tip-bot for Geliang Tang
8 siblings, 1 reply; 16+ messages in thread
From: Rafael J. Wysocki @ 2017-04-18 14:41 UTC (permalink / raw)
To: Geliang Tang, Borislav Petkov, Luck, Tony
Cc: Len Brown, linux-acpi, linux-kernel
On Saturday, March 11, 2017 08:46:55 AM Geliang Tang wrote:
> Use setup_deferrable_timer() instead of init_timer_deferrable() to
> simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Boris, Tony, any concerns?
If not, do you want to route this through the RAS tree?
> ---
> drivers/acpi/apei/ghes.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index b192b42..33ca196 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -1005,9 +1005,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
>
> switch (generic->notify.type) {
> case ACPI_HEST_NOTIFY_POLLED:
> - ghes->timer.function = ghes_poll_func;
> - ghes->timer.data = (unsigned long)ghes;
> - init_timer_deferrable(&ghes->timer);
> + setup_deferrable_timer(&ghes->timer, ghes_poll_func,
> + (unsigned long)ghes);
> ghes_add_timer(ghes);
> break;
> case ACPI_HEST_NOTIFY_EXTERNAL:
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] ACPI / APEI: use setup_deferrable_timer
2017-04-18 14:41 ` Rafael J. Wysocki
@ 2017-04-18 17:21 ` Borislav Petkov
0 siblings, 0 replies; 16+ messages in thread
From: Borislav Petkov @ 2017-04-18 17:21 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Geliang Tang, Luck, Tony, Len Brown, linux-acpi, linux-kernel
On Tue, Apr 18, 2017 at 04:41:55PM +0200, Rafael J. Wysocki wrote:
> On Saturday, March 11, 2017 08:46:55 AM Geliang Tang wrote:
> > Use setup_deferrable_timer() instead of init_timer_deferrable() to
> > simplify the code.
> >
> > Signed-off-by: Geliang Tang <geliangtang@gmail.com>
>
> Boris, Tony, any concerns?
>
> If not, do you want to route this through the RAS tree?
Sure, applied, thanks.
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
^ permalink raw reply [flat|nested] 16+ messages in thread
* [tip:ras/core] ACPI/APEI: Use setup_deferrable_timer()
2017-03-11 0:46 [PATCH] ACPI / APEI: use setup_deferrable_timer Geliang Tang
` (7 preceding siblings ...)
2017-04-18 14:41 ` Rafael J. Wysocki
@ 2017-04-19 10:09 ` tip-bot for Geliang Tang
8 siblings, 0 replies; 16+ messages in thread
From: tip-bot for Geliang Tang @ 2017-04-19 10:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: tbaicar, bp, lenb, tglx, rjw, geliangtang, linux-kernel, mingo, hpa
Commit-ID: 7237c75b2717d59ebf2c2595d416e16a160154e1
Gitweb: http://git.kernel.org/tip/7237c75b2717d59ebf2c2595d416e16a160154e1
Author: Geliang Tang <geliangtang@gmail.com>
AuthorDate: Tue, 18 Apr 2017 20:45:28 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 19 Apr 2017 12:00:14 +0200
ACPI/APEI: Use setup_deferrable_timer()
Use setup_deferrable_timer() instead of init_timer_deferrable() to
simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Tested-by: Tyler Baicar <tbaicar@codeaurora.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Link: http://lkml.kernel.org/r/3afa5498142ef68256023257dad37b9f8352e65e.1489060803.git.geliangtang@gmail.com
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/acpi/apei/ghes.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index b192b42..33ca196 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -1005,9 +1005,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
switch (generic->notify.type) {
case ACPI_HEST_NOTIFY_POLLED:
- ghes->timer.function = ghes_poll_func;
- ghes->timer.data = (unsigned long)ghes;
- init_timer_deferrable(&ghes->timer);
+ setup_deferrable_timer(&ghes->timer, ghes_poll_func,
+ (unsigned long)ghes);
ghes_add_timer(ghes);
break;
case ACPI_HEST_NOTIFY_EXTERNAL:
^ permalink raw reply [flat|nested] 16+ messages in thread