From patchwork Wed Apr 19 15:23:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 752329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w7Ql04ZT3z9ryZ for ; Thu, 20 Apr 2017 01:23:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p/lT5cAr"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Re4d+Ij8"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=4RQNs/Pia/aBxkA1JH2ZrI9nQ25djDZ72+KbqFXEAq4=; b=p/l T5cArpN4UeOhm4SR9qcK98hd+P0TNxuIJsA5gV2WJEaO8bwD4JGOv4uYOV03VJpfmvgoJaL+Crnpo cAXR/J0bB4Jopl/nIAKW8pY9RLfoPy0NIJzVsb3aTxC4fvaL4+SLwpSFtH6RfniTWYFCI68x/JAED DM6ytKicUfxWGzJ/nJN4Ix7vQMrR+sKyAtW58NPbRlOx2f9BmpUk+53lSONq4QG6bVMAFhHq0QRD2 NxMghVqm7d5BV2dEqIPoNI8YkIQJM8qzgCT95zr8IpeduLls4dPFvlnJq0/6PFecsK8b9paNHLDl5 4vW3KMaC0/YBh61HLjEiN0wVgSsLjLg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d0rSS-0003Pq-Cp; Wed, 19 Apr 2017 15:23:52 +0000 Received: from mail-it0-x244.google.com ([2607:f8b0:4001:c0b::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d0rSP-0003Jy-5W for linux-mtd@lists.infradead.org; Wed, 19 Apr 2017 15:23:51 +0000 Received: by mail-it0-x244.google.com with SMTP id e132so3686019ite.2 for ; Wed, 19 Apr 2017 08:23:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=m3KxV8+r6FFAs6Z3xtmtVuUHfnXaFn8WdRVGTBL6cHA=; b=Re4d+Ij8XzWE1+qOqZjYTauW5/3uESXwvMaAV0zLQ0kHzg38PgAz1wkd8vXhidrJ2F GyW5XYcP0jhNsi/bItcanldX50vm46+B9sSVYpOVN9neKk/0EK/ocLitRykKW/p4ocJp CELJguKPTKpxYnfXzA4dNqFHCNPrJXU+342gzDx/C+eLjcJY0F+jXpsCsx7Uvysh8xFW HpP7WxTQ7/x/8VyjBV4/iaqaSJLjDaCM6gSYhLplvNBrh8ZsNzXv1ELZjs/J0j1YKds8 RJvh17NV7MhvLyGmFEt0cCcfjs4xl9LdaTHwh3U7EwCy1W836ou6zqujkhrqC1rgPjdc YOxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m3KxV8+r6FFAs6Z3xtmtVuUHfnXaFn8WdRVGTBL6cHA=; b=VSnSkWn9dUSNnHFAwXJ8ZMzRfj5x9vx8ko8GfZk+SF9bG35a/v+3BLhtrmdX59Fh2L g+ixNnQBBRUhcrYZtMN1J3gExm9WASqf2YlfjBH+MGKw1b9LQd6aSK765Q32B4/+QVcU Cv4kdPHDLu3HIr/bgrog4q+1PUKF8tKIUkgX8woE4fpgw78sqGDkqQ3rwG1pjljeLmRs rSBOShfi8jbjhl/m28k7PRw87Q+Nb6I+BkJDYI/1cgq0qroRp0+Nh8m0l6ucpyySl62Y WelMV4dtAaLFJRUms07S0V63+42sVWmERx5iQ/BEo+6p+lqmPwla/qbj/hjRQ46Rvs9H f50A== X-Gm-Message-State: AN3rC/5esPuRGvaffJ2ozr6fSFuU+3ZM6s8JeXCO/M+0+ynipaPzfdMt CmEacU9dgMgl3g== X-Received: by 10.84.225.145 with SMTP id u17mr4064855plj.91.1492615408188; Wed, 19 Apr 2017 08:23:28 -0700 (PDT) Received: from squirtle.lan (c-73-19-0-61.hsd1.wa.comcast.net. [73.19.0.61]) by smtp.gmail.com with ESMTPSA id x65sm5301328pfb.111.2017.04.19.08.23.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Apr 2017 08:23:27 -0700 (PDT) From: Andrey Smirnov To: linux-mtd@lists.infradead.org Subject: [PATCH v3 1/6] mtd: dataflash: Replace C99 types with their kernel counterparts Date: Wed, 19 Apr 2017 08:23:00 -0700 Message-Id: <20170419152305.17226-1-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170419_082349_254024_399762CD X-CRM114-Status: GOOD ( 14.76 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:4001:c0b:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andrew.smirnov[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Andrey Smirnov , Richard Weinberger , linux-kernel@vger.kernel.org, Cyrille Pitchen , Brian Norris , David Woodhouse , cphealy@gmail.com MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org No functional change intended. Cc: cphealy@gmail.com Cc: David Woodhouse Cc: Brian Norris Cc: Boris Brezillon Cc: Richard Weinberger Cc: Cyrille Pitchen Cc: linux-kernel@vger.kernel.org Acked-by: Marek Vasut Signed-off-by: Andrey Smirnov --- Changes since [v2]: - Re-worded commit message - Collected Acked-by from Marek Not present in v1 [v2]: http://lkml.kernel.org/r/20170418142127.23301-1-andrew.smirnov@gmail.com drivers/mtd/devices/mtd_dataflash.c | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index f9e9bd1..a566231 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -84,7 +84,7 @@ struct dataflash { - uint8_t command[4]; + u8 command[4]; char name[24]; unsigned short page_offset; /* offset in flash address */ @@ -153,8 +153,8 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) struct spi_transfer x = { }; struct spi_message msg; unsigned blocksize = priv->page_size << 3; - uint8_t *command; - uint32_t rem; + u8 *command; + u32 rem; pr_debug("%s: erase addr=0x%llx len 0x%llx\n", dev_name(&spi->dev), (long long)instr->addr, @@ -187,8 +187,8 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) pageaddr = pageaddr << priv->page_offset; command[0] = do_block ? OP_ERASE_BLOCK : OP_ERASE_PAGE; - command[1] = (uint8_t)(pageaddr >> 16); - command[2] = (uint8_t)(pageaddr >> 8); + command[1] = (u8)(pageaddr >> 16); + command[2] = (u8)(pageaddr >> 8); command[3] = 0; pr_debug("ERASE %s: (%x) %x %x %x [%i]\n", @@ -239,7 +239,7 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, struct spi_transfer x[2] = { }; struct spi_message msg; unsigned int addr; - uint8_t *command; + u8 *command; int status; pr_debug("%s: read 0x%x..0x%x\n", dev_name(&priv->spi->dev), @@ -271,9 +271,9 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, * fewer "don't care" bytes. Both buffers stay unchanged. */ command[0] = OP_READ_CONTINUOUS; - command[1] = (uint8_t)(addr >> 16); - command[2] = (uint8_t)(addr >> 8); - command[3] = (uint8_t)(addr >> 0); + command[1] = (u8)(addr >> 16); + command[2] = (u8)(addr >> 8); + command[3] = (u8)(addr >> 0); /* plus 4 "don't care" bytes */ status = spi_sync(priv->spi, &msg); @@ -308,7 +308,7 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len, size_t remaining = len; u_char *writebuf = (u_char *) buf; int status = -EINVAL; - uint8_t *command; + u8 *command; pr_debug("%s: write 0x%x..0x%x\n", dev_name(&spi->dev), (unsigned)to, (unsigned)(to + len)); @@ -455,11 +455,11 @@ static int dataflash_get_otp_info(struct mtd_info *mtd, size_t len, } static ssize_t otp_read(struct spi_device *spi, unsigned base, - uint8_t *buf, loff_t off, size_t len) + u8 *buf, loff_t off, size_t len) { struct spi_message m; size_t l; - uint8_t *scratch; + u8 *scratch; struct spi_transfer t; int status; @@ -538,7 +538,7 @@ static int dataflash_write_user_otp(struct mtd_info *mtd, { struct spi_message m; const size_t l = 4 + 64; - uint8_t *scratch; + u8 *scratch; struct spi_transfer t; struct dataflash *priv = mtd->priv; int status; @@ -689,14 +689,14 @@ struct flash_info { /* JEDEC id has a high byte of zero plus three data bytes: * the manufacturer id, then a two byte device id. */ - uint32_t jedec_id; + u32 jedec_id; /* The size listed here is what works with OP_ERASE_PAGE. */ unsigned nr_pages; - uint16_t pagesize; - uint16_t pageoffset; + u16 pagesize; + u16 pageoffset; - uint16_t flags; + u16 flags; #define SUP_POW2PS 0x0002 /* supports 2^N byte pages */ #define IS_POW2PS 0x0001 /* uses 2^N byte pages */ }; @@ -739,9 +739,9 @@ static struct flash_info dataflash_data[] = { static struct flash_info *jedec_probe(struct spi_device *spi) { int tmp; - uint8_t code = OP_READ_ID; - uint8_t id[3]; - uint32_t jedec; + u8 code = OP_READ_ID; + u8 id[3]; + u32 jedec; struct flash_info *info; int status;