From patchwork Fri Apr 21 08:04:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 9692055 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 2DDE460328 for ; Fri, 21 Apr 2017 08:06:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 202EC284D1 for ; Fri, 21 Apr 2017 08:06:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14DBA28616; Fri, 21 Apr 2017 08:06:31 +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=-6.9 required=2.0 tests=BAYES_00,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 9FE622860F for ; Fri, 21 Apr 2017 08:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1036516AbdDUIGW (ORCPT ); Fri, 21 Apr 2017 04:06:22 -0400 Received: from mx2.suse.de ([195.135.220.15]:60682 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1036400AbdDUIFJ (ORCPT ); Fri, 21 Apr 2017 04:05:09 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0FD09AD25; Fri, 21 Apr 2017 08:05:05 +0000 (UTC) From: Johannes Thumshirn To: "Martin K . Petersen" Cc: James Bottomley , Christoph Hellwig , Hannes Reinecke , Bart Van Assche , Linux SCSI Mailinglist , Linux Kernel Mailinglist , Jinpu Wang , John Garry , tj@kernel.org, Johannes Thumshirn Subject: [PATCH v2 5/5] scsi: pm8001: remove the SAS host after the SCSI host Date: Fri, 21 Apr 2017 10:04:50 +0200 Message-Id: <99ded108ba92054564a83594d3d65deb47ea8631.1492760075.git.jthumshirn@suse.de> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: In-Reply-To: References: 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 After commit bcdde7e ("sysfs: make __sysfs_remove_dir() recursive") changed the removal path of kernfs to make it recursive we have to remove the SAS host before the SCSI host or we will see sysfs warnings on not found sysfs groups for kobjects. Signed-off-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/scsi/pm8001/pm8001_init.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 417368ccb686..e8f3d5ada201 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -1086,11 +1086,15 @@ static void pm8001_pci_remove(struct pci_dev *pdev) { struct sas_ha_struct *sha = pci_get_drvdata(pdev); struct pm8001_hba_info *pm8001_ha; + struct Scsi_Host *shost; int i, j; pm8001_ha = sha->lldd_ha; - scsi_remove_host(pm8001_ha->shost); + shost = pm8001_ha->shost; + sas_unregister_ha(sha); - sas_remove_host(pm8001_ha->shost); + sas_remove_host(shost); + scsi_remove_host(shost); + list_del(&pm8001_ha->list); PM8001_CHIP_DISP->interrupt_disable(pm8001_ha, 0xFF); PM8001_CHIP_DISP->chip_soft_rst(pm8001_ha);