From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB079ECDE2B for ; Thu, 12 Sep 2019 02:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88E8A20863 for ; Thu, 12 Sep 2019 02:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729398AbfILCzO (ORCPT ); Wed, 11 Sep 2019 22:55:14 -0400 Received: from smtprelay0243.hostedemail.com ([216.40.44.243]:49321 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729363AbfILCzN (ORCPT ); Wed, 11 Sep 2019 22:55:13 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id CF71E8024B57; Thu, 12 Sep 2019 02:55:11 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: point24_847b19a4a084f X-Filterd-Recvd-Size: 2396 Received: from joe-laptop.perches.com (unknown [47.151.152.152]) (Authenticated sender: joe@perches.com) by omf16.hostedemail.com (Postfix) with ESMTPA; Thu, 12 Sep 2019 02:55:10 +0000 (UTC) From: Joe Perches To: Dan Williams , Vishal Verma , Dave Jiang , Keith Busch , Ira Weiny Cc: Dan Carpenter , linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/13] nvdimm: Use "unsigned int" in preference to "unsigned" Date: Wed, 11 Sep 2019 19:54:35 -0700 Message-Id: <11b118ab06da3d2c54fe3ec62f42bd89914878bc.1568256707.git.joe@perches.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the more common kernel type. Signed-off-by: Joe Perches --- drivers/nvdimm/label.c | 2 +- drivers/nvdimm/nd.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index 2c780c5352dc..5700d9b35b8f 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -34,7 +34,7 @@ static u32 best_seq(u32 a, u32 b) return a; } -unsigned sizeof_namespace_label(struct nvdimm_drvdata *ndd) +unsigned int sizeof_namespace_label(struct nvdimm_drvdata *ndd) { return ndd->nslabel_size; } diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index c10a4b94d44a..1636061b1f93 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -81,7 +81,7 @@ static inline struct nd_namespace_index *to_next_namespace_index( return to_namespace_index(ndd, ndd->ns_next); } -unsigned sizeof_namespace_label(struct nvdimm_drvdata *ndd); +unsigned int sizeof_namespace_label(struct nvdimm_drvdata *ndd); #define namespace_label_has(ndd, field) \ (offsetof(struct nd_namespace_label, field) \ @@ -170,9 +170,9 @@ struct nd_blk_region { /* * Lookup next in the repeating sequence of 01, 10, and 11. */ -static inline unsigned nd_inc_seq(unsigned seq) +static inline unsigned int nd_inc_seq(unsigned int seq) { - static const unsigned next[] = { 0, 2, 3, 1 }; + static const unsigned int next[] = { 0, 2, 3, 1 }; return next[seq & 3]; } -- 2.15.0