Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2354914imm; Thu, 7 Jun 2018 09:15:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJtiypLwVUxhjTPFsldjj6B9YO5NzwK5PqPBfuwGzGaU02G0BahW7iSNsS9CY6D2put0QFq X-Received: by 2002:a17:902:5501:: with SMTP id f1-v6mr2713055pli.108.1528388119633; Thu, 07 Jun 2018 09:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528388119; cv=none; d=google.com; s=arc-20160816; b=Mm9Zq6dJIufglyueJOqDn1mTWNGOdU0cyQBQ4tOPIuidK1QxiyiT64PEmOYv9PTfe9 x9hYd9ND70Up0xQhyeThccRdCvHAWdLpfycbFiNKC4pRT2uHdcGA5XWqxr7djR6Z0b0T Z/aVBlyA+WG/Vw5hgnLEVt2FOuyvzXEQXmOfd9d858R2V2bxyBXoLYmNUoSKD95ktQKR 7YQXkJJCrbAJ0KvxqBJ6WMlHqcbRxNWorSN6Kb9tfg2J26KK2O0GwWkZyLfLrUJT3Pw4 oIZBZ0coVi4CT1e3DdjMJWv1kobDZiun0a+Q30VmBAU6OdnJNm1K6YfHsiZo3vRZF2p1 AK3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=WLDacs4bEniyUbNpctEZ/vlpvLPSZUzPnksboM9xIV4=; b=mwoEJ+nYd/wtsSi6CSL+iBc0tmi8B2iCC1n/+XF3M20rCLhmTHbxyu8SSn/97RZPaj 1iUocHqV+9QRUI6c7pECh0cm7Lm02a+cS99eDgZB+nTZh+VKMbR5qt/M2B5/Ii0Fu9ZZ Bp+jLapfUhi15YHA8t87Q51a9fKzVzKGwqSJtX0Z4jR14mV756e9yguqGJ0y1oyprlVV +vBu4MRiI+EAHPUJ7KTygd9IufhE8IEhiIC3QEb/h86qdqO6Wev/vsf+AB1k+3HF+7G3 unmp7tHpnrDTIDqsWAcRRBaNub31JGLWINOI8o6slIuujmi+1yl/LyGnBb6h/mpY6NaA odXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q11-v6si445353pgp.95.2018.06.07.09.15.05; Thu, 07 Jun 2018 09:15:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935856AbeFGQNd (ORCPT + 99 others); Thu, 7 Jun 2018 12:13:33 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:39138 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932930AbeFGOI7 (ORCPT ); Thu, 7 Jun 2018 10:08:59 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvay-0005Zt-Be; Thu, 07 Jun 2018 15:08:56 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvax-0002gu-CR; Thu, 07 Jun 2018 15:08:55 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Johannes Thumshirn" , "Martin K. Petersen" , "Tomas Henzl" , "Christoph Hellwig" , "John Garry" , "Ewan Milne" , "Jason Yan" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 011/410] scsi: libsas: remove the numbering for each event enum In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Jason Yan commit 0d78f969b10f27e0be34210d482a01e1ee92994c upstream. Numbering for each event enum makes no sense. Remove the numbering so that we don't have to calculate the number by hand every time. Signed-off-by: Jason Yan CC: John Garry CC: Johannes Thumshirn CC: Ewan Milne CC: Christoph Hellwig CC: Tomas Henzl Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Martin K. Petersen Signed-off-by: Ben Hutchings --- include/scsi/libsas.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -67,31 +67,31 @@ enum ha_event { enum port_event { PORTE_BYTES_DMAED = 0U, - PORTE_BROADCAST_RCVD = 1, - PORTE_LINK_RESET_ERR = 2, - PORTE_TIMER_EVENT = 3, - PORTE_HARD_RESET = 4, - PORT_NUM_EVENTS = 5, + PORTE_BROADCAST_RCVD, + PORTE_LINK_RESET_ERR, + PORTE_TIMER_EVENT, + PORTE_HARD_RESET, + PORT_NUM_EVENTS, }; enum phy_event { PHYE_LOSS_OF_SIGNAL = 0U, - PHYE_OOB_DONE = 1, - PHYE_OOB_ERROR = 2, - PHYE_SPINUP_HOLD = 3, /* hot plug SATA, no COMWAKE sent */ - PHYE_RESUME_TIMEOUT = 4, - PHY_NUM_EVENTS = 5, + PHYE_OOB_DONE, + PHYE_OOB_ERROR, + PHYE_SPINUP_HOLD, /* hot plug SATA, no COMWAKE sent */ + PHYE_RESUME_TIMEOUT, + PHY_NUM_EVENTS, }; enum discover_event { DISCE_DISCOVER_DOMAIN = 0U, - DISCE_REVALIDATE_DOMAIN = 1, - DISCE_PORT_GONE = 2, - DISCE_PROBE = 3, - DISCE_SUSPEND = 4, - DISCE_RESUME = 5, - DISCE_DESTRUCT = 6, - DISC_NUM_EVENTS = 7, + DISCE_REVALIDATE_DOMAIN, + DISCE_PORT_GONE, + DISCE_PROBE, + DISCE_SUSPEND, + DISCE_RESUME, + DISCE_DESTRUCT, + DISC_NUM_EVENTS, }; /* ---------- Expander Devices ---------- */