From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754027AbdKAHGT (ORCPT ); Wed, 1 Nov 2017 03:06:19 -0400 Received: from mail-by2nam01on0082.outbound.protection.outlook.com ([104.47.34.82]:34831 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750904AbdKAHGR (ORCPT ); Wed, 1 Nov 2017 03:06:17 -0400 From: "Rangankar, Manish" To: Kees Cook , "Martin K. Petersen" CC: Dept-Eng QLogic Storage Upstream , "James E.J. Bottomley" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] scsi: qla4xxx: Convert timers to use timer_setup() Thread-Topic: [PATCH] scsi: qla4xxx: Convert timers to use timer_setup() Thread-Index: AQHTTXkcJqM/2rZUYUykqlEH4WeIJqL/gQsA Date: Wed, 1 Nov 2017 07:06:14 +0000 Message-ID: References: <20171025100743.GA145111@beast> In-Reply-To: <20171025100743.GA145111@beast> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Manish.Rangankar@cavium.com; x-originating-ip: [114.143.185.87] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN3PR07MB2482;6:ivcViJboTXSjepQxJzxjbw3TlzocoI8lX/TmM79Ck9g0ZExjc3v3EPXwtHSSp43wkGrEv/j/keYdlzQVkvXXtHuZo41n6R8Z1/w97GF2hiwj3ZjzUZDCpAanQWl+QvSLEmP0AQuqmzTzQOMWoGaksUQ8V9BND5xtD0eF9/y+GZu3QgKayVIitNkHDA8wYRe4AYnwwI36ckIH2pOJDiumZD51b8I4KWHsvEyhsNuzpE9+IegrEbx8psTU55lTEA5JmU/cQyI0vaBrB73Yq2QHJOmA1Aiw4PRP88dtNmrvsycQW92UyFNcxCNH5xkBof8KyIqyYCuuT7a8th75cKeA565YtcDdB/eS78OTMBlVwFU=;5:YgS01djSJQNX8w2M+EdiP4Mo4LWbLfmFiPBI5vBQ1hV2PVkYLkThQUEv+yJXf4HQswLr20y6h3rEKLgNTw+cDVi3Sk9CA5RcJFcZEvl176/glTGZ36OYzcPgTiED1czs5ebF4Zn7u757LMrPRB+otKnbZgrP88ru7biOxAIEYO8=;24:pWdQtgh8OPUumUHHdu39asSWAiTMb+apY64ZKqB4FGkz2XwuRZWhDYlRlCnlgS2sppNaicjmHWiY2feJ/6pOrIP9jNQMI0w9KmMuhwlTvuc=;7:Qq/kgytDIAf74osvpqN7aj+exY2g4fav72h5GAU6zY/1RnF4M7HuGCe9RB31+HPe/o/WwszPgCtAEnjrSj9+T+7G4+FFcN4s61AFpKgumlXbOoSFTO2yyAUi3hXHeska7pveYfRsIFhzDFsF7Pe+lhmjeo7gGeaXJatMt/wTBtVq9Aa/ZsIA7xZ31jMKM6NqWQLS9AyV1lojIyZ62sUitjZO/pcsgVuwuKiXp8BiqOPDQyiYrjs1fcZ1tsMy57A2 x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 45f220fb-5a9a-49c8-7671-08d520f70abd x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(2017052603199);SRVR:BN3PR07MB2482; x-ms-traffictypediagnostic: BN3PR07MB2482: x-exchange-antispam-report-test: UriScan:(9452136761055)(104084551191319)(146099531331640); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231020)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN3PR07MB2482;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN3PR07MB2482; x-forefront-prvs: 0478C23FE0 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(24454002)(199003)(189002)(53936002)(189998001)(2900100001)(4326008)(81156014)(81166006)(8936002)(8676002)(54906003)(86362001)(72206003)(110136005)(478600001)(97736004)(5660300001)(2950100002)(36756003)(316002)(106356001)(229853002)(77096006)(6486002)(25786009)(6436002)(2906002)(6116002)(68736007)(6506006)(14454004)(3846002)(102836003)(6512007)(99286003)(6246003)(105586002)(66066001)(101416001)(3280700002)(3660700001)(50986999)(53546010)(7736002)(76176999)(305945005)(54356999)(32563001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR07MB2482;H:BN3PR07MB2483.namprd07.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: MIME-Version: 1.0 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45f220fb-5a9a-49c8-7671-08d520f70abd X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2017 07:06:14.9805 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2482 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vA176PaJ008917 On 25/10/17 3:37 PM, "Kees Cook" wrote: >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: QLogic-Storage-Upstream@qlogic.com >Cc: "James E.J. Bottomley" >Cc: "Martin K. Petersen" >Cc: linux-scsi@vger.kernel.org >Signed-off-by: Kees Cook >--- > drivers/scsi/qla4xxx/ql4_os.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c >index 64c6fa563fdb..2b8a8ce2a431 100644 >--- a/drivers/scsi/qla4xxx/ql4_os.c >+++ b/drivers/scsi/qla4xxx/ql4_os.c >@@ -3955,16 +3955,15 @@ void qla4xxx_update_session_conn_param(struct >scsi_qla_host *ha, > /* > * Timer routines > */ >+static void qla4xxx_timer(struct timer_list *t); > >-static void qla4xxx_start_timer(struct scsi_qla_host *ha, void *func, >+static void qla4xxx_start_timer(struct scsi_qla_host *ha, > unsigned long interval) > { > DEBUG(printk("scsi: %s: Starting timer thread for adapter %d\n", > __func__, ha->host->host_no)); >- init_timer(&ha->timer); >+ timer_setup(&ha->timer, qla4xxx_timer, 0); > ha->timer.expires = jiffies + interval * HZ; >- ha->timer.data = (unsigned long)ha; >- ha->timer.function = (void (*)(unsigned long))func; > add_timer(&ha->timer); > ha->timer_active = 1; > } >@@ -4508,8 +4507,9 @@ static void qla4xxx_check_relogin_flash_ddb(struct >iscsi_cls_session *cls_sess) > * qla4xxx_timer - checks every second for work to do. > * @ha: Pointer to host adapter structure. > **/ >-static void qla4xxx_timer(struct scsi_qla_host *ha) >+static void qla4xxx_timer(struct timer_list *t) > { >+ struct scsi_qla_host *ha = from_timer(ha, t, timer); > int start_dpc = 0; > uint16_t w; > >@@ -8805,7 +8805,7 @@ static int qla4xxx_probe_adapter(struct pci_dev >*pdev, > ha->isp_ops->enable_intrs(ha); > > /* Start timer thread. */ >- qla4xxx_start_timer(ha, qla4xxx_timer, 1); >+ qla4xxx_start_timer(ha, 1); > > set_bit(AF_INIT_DONE, &ha->flags); > >-- >2.7.4 Acked-by: Manish Rangankar