From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bart Van Assche Subject: Move two declarations from scsi_scan.c into scsi_priv.h Date: Mon, 28 Mar 2016 14:36:07 -0700 Message-ID: <56F9A3C7.6070107@sandisk.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-bn1bon0066.outbound.protection.outlook.com ([157.56.111.66]:22984 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751537AbcC1VgL (ORCPT ); Mon, 28 Mar 2016 17:36:11 -0400 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley , "Martin K. Petersen" Cc: "linux-scsi@vger.kernel.org" Consistency of the declarations that have been moved can only be checked by the compiler if these are present in a header file that is included from both the source file with the definition and the source file with the caller(s). Hence move these two declarations. Signed-off-by: Bart Van Assche --- drivers/scsi/scsi_priv.h | 2 ++ drivers/scsi/scsi_scan.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 27b4d0a..68f7f22 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -83,6 +83,8 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd); extern int scsi_maybe_unblock_host(struct scsi_device *sdev); extern void scsi_device_unbusy(struct scsi_device *sdev); extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason); +extern void scsi_requeue_run_queue(struct work_struct *work); +extern void scsi_evt_thread(struct work_struct *work); extern void scsi_io_completion(struct scsi_cmnd *, unsigned int); extern void scsi_run_host_queues(struct Scsi_Host *shost); extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev); diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 97074c9..9f021e4 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -214,8 +214,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, struct scsi_device *sdev; int display_failure_msg = 1, ret; struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); - extern void scsi_evt_thread(struct work_struct *work); - extern void scsi_requeue_run_queue(struct work_struct *work); sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size, GFP_ATOMIC); -- 2.7.3