From patchwork Tue Dec 5 02:11:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ching Huang X-Patchwork-Id: 10092619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 87EE860327 for ; Tue, 5 Dec 2017 10:11:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B6D828D1D for ; Tue, 5 Dec 2017 10:11:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F89528D27; Tue, 5 Dec 2017 10:11:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED,DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF2C8294A9 for ; Tue, 5 Dec 2017 10:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753322AbdLEKLi (ORCPT ); Tue, 5 Dec 2017 05:11:38 -0500 Received: from mail-pg0-f53.google.com ([74.125.83.53]:38827 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753296AbdLEKLc (ORCPT ); Tue, 5 Dec 2017 05:11:32 -0500 Received: by mail-pg0-f53.google.com with SMTP id f12so10360395pgo.5 for ; Tue, 05 Dec 2017 02:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=areca-com-tw.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:date:message-id:mime-version :content-transfer-encoding; bh=k6Yo4CRg5I8mGC3MQWWSf5XxBdpQOhqHT12XX44MA1s=; b=gIruCNxeI3RqHd7yXihqgu1x8crHA7a0wlzaFvghKhCTLoxMdQG4gpDcjemKRGe1DK NG04m8DzeJP/OPRA8IyCgxuX3pxL0TrfM7/HmukafU7YGRTPxflczby61+lcei2AlIdx TdFOArQB8Hkvdq667CF+hbPhbbJWi+nKwxniAQlPp7HWxcMF8y8iexPEl2VDAaUHAF7T 8cKyCw82aCOFsbSnxbL0IeAVWrBstevORYsOo8Ywpbxuwx+Lja5pUJ4jwJQHjSTk+0A8 vDVJuW9AH4BBImuKHx1+OPpWRaCcUTBBdhtoUXEJqYVlwHWY+pq2sUyJiUxCGPHWVSTX zQnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:mime-version :content-transfer-encoding; bh=k6Yo4CRg5I8mGC3MQWWSf5XxBdpQOhqHT12XX44MA1s=; b=jNeKQJRfEr+IvA+4mknEbiVlo8FEE6kcD+i46n43FPysUghlaUkZ8G8sm6rZwMgcIi XRt3cUo/okhrQpdL6z8WowvUOpc3wdG0NoRJUGD5pjod5Pc8DrIHP+LXm+7XZJvB679K g9/2EJrkAotG1YY7W6MpP4V3vq6v3uk/mx2HOhd185gc4SqE8z0jWKR8P8wr5JK/s4ij 5b2qj6jfLaqd8wojCfRTFW15Wy8eYuD7SG08gnZ3gQ2EXDCHeQu3yOBdjZoKwDtbanTb 3Io+yUrVkP8FftuSuqHxuj5misqCil1AKQXdt8p6THMec0/Lp90eQ0G66RyTREsjrzRX O9bw== X-Gm-Message-State: AJaThX5XZpLTovjrgUE8DGb44M7VeC+uK+sMQPUPt9JYXv8GNo2FB57+ qfDWsclkxsFqmSwiZY9yOB16yvHs X-Google-Smtp-Source: AGs4zMauI/WrsxUpNVfoQ/AN/oMc7TFoKh1GiFjJYAHrR7i0WrbtFB7x0tzcF9XJMtoCdG+yDLrEaQ== X-Received: by 10.84.135.129 with SMTP id 1mr18176345plj.47.1512468691561; Tue, 05 Dec 2017 02:11:31 -0800 (PST) Received: from [192.168.0.105] (60-248-88-209.HINET-IP.hinet.net. [60.248.88.209]) by smtp.gmail.com with ESMTPSA id i85sm28633388pfi.54.2017.12.05.02.11.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 02:11:30 -0800 (PST) Subject: [PATCH 12/17] scsi: arcmsr: spin off duplicate code of timer init for message isr BH in arcmsr_probe and arcmsr_resume as a function From: Ching Huang To: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: James.Bottomley@HansenPartnership.com, sfr@canb.auug.org.au Date: Tue, 05 Dec 2017 10:11:23 +0800 Message-ID: <1512439883.4577.68.camel@Centos6.3-64> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 (2.32.3-37.el6) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ching Huang spin off duplicate code of timer init for message isr BH in arcmsr_probe and arcmsr_resume as a function arcmsr_init_get_devmap_timer Signed-off-by: Ching Huang diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c 2017-12-05 11:45:34.000000000 +0800 +++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2017-12-05 11:45:06.000000000 +0800 @@ -857,6 +857,17 @@ out_free_irq: return FAILED; } +static void arcmsr_init_get_devmap_timer(struct AdapterControlBlock *pacb) +{ + INIT_WORK(&pacb->arcmsr_do_message_isr_bh, arcmsr_message_isr_bh_fn); + atomic_set(&pacb->rq_map_token, 16); + atomic_set(&pacb->ante_token_value, 16); + pacb->fw_flag = FW_NORMAL; + timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0); + pacb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ); + add_timer(&pacb->eternal_timer); +} + static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb) { timer_setup(&pacb->refresh_timer, arcmsr_set_iop_datetime, 0); @@ -946,13 +957,7 @@ static int arcmsr_probe(struct pci_dev * if (arcmsr_request_irq(pdev, acb) == FAILED) goto scsi_host_remove; arcmsr_iop_init(acb); - INIT_WORK(&acb->arcmsr_do_message_isr_bh, arcmsr_message_isr_bh_fn); - atomic_set(&acb->rq_map_token, 16); - atomic_set(&acb->ante_token_value, 16); - acb->fw_flag = FW_NORMAL; - timer_setup(&acb->eternal_timer, arcmsr_request_device_map, 0); - acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ); - add_timer(&acb->eternal_timer); + arcmsr_init_get_devmap_timer(acb); if (set_date_time) arcmsr_init_set_datetime_timer(acb); if(arcmsr_alloc_sysfs_attr(acb)) @@ -1043,13 +1048,7 @@ static int arcmsr_resume(struct pci_dev if (arcmsr_request_irq(pdev, acb) == FAILED) goto controller_stop; arcmsr_iop_init(acb); - INIT_WORK(&acb->arcmsr_do_message_isr_bh, arcmsr_message_isr_bh_fn); - atomic_set(&acb->rq_map_token, 16); - atomic_set(&acb->ante_token_value, 16); - acb->fw_flag = FW_NORMAL; - timer_setup(&acb->eternal_timer, arcmsr_request_device_map, 0); - acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ); - add_timer(&acb->eternal_timer); + arcmsr_init_get_devmap_timer(acb); if (set_date_time) arcmsr_init_set_datetime_timer(acb); return 0;