From patchwork Fri May 13 09:38:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitra P B X-Patchwork-Id: 9089761 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9CB15BF29F for ; Fri, 13 May 2016 09:38:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7990B201FE for ; Fri, 13 May 2016 09:38:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CEFB201CE for ; Fri, 13 May 2016 09:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751849AbcEMJiF (ORCPT ); Fri, 13 May 2016 05:38:05 -0400 Received: from mail-qk0-f175.google.com ([209.85.220.175]:35277 "EHLO mail-qk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751272AbcEMJiE (ORCPT ); Fri, 13 May 2016 05:38:04 -0400 Received: by mail-qk0-f175.google.com with SMTP id n62so50945381qkc.2 for ; Fri, 13 May 2016 02:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:references:in-reply-to:mime-version:thread-index:date :message-id:subject:to:cc; bh=u3YE4laCvibqhqD8msMRHLsZLT6aVLHzWL3ZLydFrck=; b=MjgJSOskJ9BIOOsQHnA94Zr4dtC7O2A8D3zzoyK4NLhOwBO5jnaJHm7VliPd/msvbz 2dtypECqTsBjkpWf/97bPZOs1VoPIDC1gNGNfwdIQkOIGd7xV+LPNcYz53uXbEpD+de5 oXxN1C3faQLqh80kt9DzKOpSxZr+mQ3MfmnrA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:references:in-reply-to:mime-version :thread-index:date:message-id:subject:to:cc; bh=u3YE4laCvibqhqD8msMRHLsZLT6aVLHzWL3ZLydFrck=; b=WGy0SPCw6kDjFCbP9uorvEC79FJZvg21Bolp3jyLBCmmu6okMhAwQ52qyAnJHYXhOF a3Xl17DpTqmUsCKbCrtJ+zaUr5503pZrHGaqiDLBr0Pc8DJGgXaMDr/hklwe1oiHwurr 4jwtv5BIAuu4joPDjbZPvbBWqiZYCHXG+zWK1bvZ2IQ8Ci7+rYXOKYEZdUWGOW0MFhQp kxzfkNxDNOvnc4KJchVjbTsSXIGqewCnCM+xCLVbx4DPDcfwIT2+0ObWgyIpAXBZrUXH Xs+xdDictDELTPbq0m5texkVr/IfN7kXi6v0qfYArOqfCykhX64lYMFtQk6fi7YgTZh6 TQcw== X-Gm-Message-State: AOPr4FWcfwg10PSaF7Hjt5lbyZj2Tud7oXT2KC95g6RPpQ76Oc5Z1DNmNjBpL8qZy8QQShqMW4JJnjlJH1r/Emis X-Received: by 10.55.41.227 with SMTP id p96mr13312709qkp.119.1463132282321; Fri, 13 May 2016 02:38:02 -0700 (PDT) From: Chaitra Basappa References: <20160512203844.GC26894@mwanda> In-Reply-To: <20160512203844.GC26894@mwanda> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQF3oBaAF/i3S4WEo3bNhOUr5FRLkKBqta3A Date: Fri, 13 May 2016 15:08:01 +0530 Message-ID: Subject: RE: [patch 2/2] mpt3sas: clean up indenting a bit To: Dan Carpenter , Sathya Prakash Veerichetty Cc: Suganath Prabu Subramani , "James E.J. Bottomley" , "Martin K. Petersen" , PDL-MPT-FUSIONLINUX , linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Dan, Below patch doesn't apply smoothly on latest upstream kernel , we are seeing Hunk failures. Thanks, Chaitra -----Original Message----- From: Dan Carpenter [mailto:dan.carpenter@oracle.com] Sent: Friday, May 13, 2016 2:09 AM To: Sathya Prakash Cc: Chaitra P B; Suganath Prabu Subramani; James E.J. Bottomley; Martin K. Petersen; MPT-FusionLinux.pdl@broadcom.com; linux-scsi@vger.kernel.org; kernel-janitors@vger.kernel.org Subject: [patch 2/2] mpt3sas: clean up indenting a bit The indenting is slightly off in parts of this file so I have tidied it. Signed-off-by: Dan Carpenter @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) } _scsih_expander_node_add(ioc, sas_expander); - return 0; + return 0; out_fail: @@ -7774,9 +7774,9 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event) break; case MPT3SAS_PORT_ENABLE_COMPLETE: ioc->start_scan = 0; - if (missing_delay[0] != -1 && missing_delay[1] != -1) + if (missing_delay[0] != -1 && missing_delay[1] != -1) mpt3sas_base_update_missing_delay(ioc, missing_delay[0], - missing_delay[1]); + missing_delay[1]); dewtprintk(ioc, pr_info(MPT3SAS_FMT "port enable: complete from worker thread\n", ioc->name)); --- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 6bff13e..34d6f996 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -1865,7 +1865,7 @@ scsih_slave_configure(struct scsi_device *sdev) ds = "SSP"; } else { qdepth = MPT3SAS_SATA_QUEUE_DEPTH; - if (raid_device->device_info & + if (raid_device->device_info & MPI2_SAS_DEVICE_INFO_SATA_DEVICE) ds = "SATA"; else @@ -3497,21 +3497,21 @@ _scsih_issue_delayed_event_ack(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 event, void _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 handle) - { - Mpi2SasIoUnitControlRequest_t *mpi_request; - u32 ioc_state; - int i = smid - ioc->internal_smid; - unsigned long flags; +{ + Mpi2SasIoUnitControlRequest_t *mpi_request; + u32 ioc_state; + int i = smid - ioc->internal_smid; + unsigned long flags; - if (ioc->remove_host) { - dewtprintk(ioc, pr_info(MPT3SAS_FMT - "%s: host has been removed\n", - __func__, ioc->name)); - return; - } else if (ioc->pci_error_recovery) { - dewtprintk(ioc, pr_info(MPT3SAS_FMT - "%s: host in pci error recovery\n", - __func__, ioc->name)); + if (ioc->remove_host) { + dewtprintk(ioc, pr_info(MPT3SAS_FMT + "%s: host has been removed\n", + __func__, ioc->name)); + return; + } else if (ioc->pci_error_recovery) { + dewtprintk(ioc, pr_info(MPT3SAS_FMT + "%s: host in pci error recovery\n", + __func__, ioc->name)); return; } ioc_state = mpt3sas_base_get_iocstate(ioc, 1); @@ -5173,7 +5173,7