From patchwork Wed Feb 26 01:27:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3720151 X-Patchwork-Delegate: broonie@sirena.org.uk Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CB5329F2ED for ; Wed, 26 Feb 2014 01:27:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B7BA4201DD for ; Wed, 26 Feb 2014 01:27:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4FC8201CD for ; Wed, 26 Feb 2014 01:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750954AbaBZB1N (ORCPT ); Tue, 25 Feb 2014 20:27:13 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:61781 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800AbaBZB1M (ORCPT ); Tue, 25 Feb 2014 20:27:12 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1K00FIUXDBVO40@mailout1.samsung.com> for linux-spi@vger.kernel.org; Wed, 26 Feb 2014 10:27:11 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id EC.71.10364.FE24D035; Wed, 26 Feb 2014 10:27:11 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-a6-530d42ef2d8f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B7.7E.29263.EE24D035; Wed, 26 Feb 2014 10:27:11 +0900 (KST) Received: from DOJG1HAN03 ([12.36.166.146]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N1K004M2XDAFD80@mmp2.samsung.com>; Wed, 26 Feb 2014 10:27:10 +0900 (KST) From: Jingoo Han To: 'Mark Brown' Cc: linux-spi@vger.kernel.org, 'Jingoo Han' , 'Cory Maccarrone' , 'Michal Nazarewicz' References: <003101cf3291$8948f3a0$9bdadae0$%han@samsung.com> In-reply-to: <003101cf3291$8948f3a0$9bdadae0$%han@samsung.com> Subject: [PATCH 2/2] spi: omap-100k: fix spacing coding style issue Date: Wed, 26 Feb 2014 10:27:10 +0900 Message-id: <003701cf3291$def77600$9ce66200$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Content-language: ko Thread-index: Ac8ykYk1aprwNuQrTS6aEasK2OH12QAAAe1w X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCIsWRmVeSWpSXmKPExsVy+t8zA933TrzBBtd+cllMffiEzeLm2VyL ywsvsVo0frzJbrHgeAurA6vHzll32T02repk81j35xWTR9+WVYwenzfJBbBGcdmkpOZklqUW 6dslcGW0n/zDXnBeuWLXwQnMDYwTZLoYOTkkBEwkti5cwwhhi0lcuLeerYuRi0NIYBmjxJMt 91hgin7P+MUOkZjOKLGpvZEZJCEk8JtR4ujBchCbTUBN4suXw0BFHBwiAqoS/1+5g9QzC8xi lDjyq5kFot5W4tijrewgNqeAnUTPi+9gm4UFnCUeHZzABGKzAPV2nHrECmLzAtVvbrnDBmEL SvyYDHEQs4CWxPqdx5kgbHmJzWveMoPslRBQl3j0VxciLCKx78U7sPEiAkYST5c8ZYEouccu sSsRYpOAxLfJh6DCshKbDjBDfCspcXDFDZYJjBKzkOydhWTvLCR7ZyFZtoCRZRWjaGpBckFx UnqRiV5xYm5xaV66XnJ+7iZGSIxO2MF474D1IcZkoPUTmaVEk/OBMZ5XEm9obGZkYWpiamxk bmlGmrCSOK/ao6QgIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYwFU25+3bnf+APTsdV7zBmq F+2c4jMp45abaV3N3+b81v06ghUv3V4nue5hn2V5vTao79d3aXuXwsjuoI3+vMlXZFvrL5Rs 8pyfeOP/C01RJ59a/m99Dx+JvTP4PS/KIXJmftJRL/VJp5X15r86JJQSujrX7deEvhtzXZwZ dlw+lCoY/M19X50SS3FGoqEWc1FxIgDG1htx5wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMKsWRmVeSWpSXmKPExsVy+t9jQd33TrzBBvtnsVlMffiEzeLm2VyL ywsvsVo0frzJbrHgeAurA6vHzll32T02repk81j35xWTR9+WVYwenzfJBbBGNTDaZKQmpqQW KaTmJeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl5gAtV1IoS8wpBQoFJBYX K+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jFmtJ/8w15wXrli18EJzA2ME2S6GDk5JARMJH7P +MUOYYtJXLi3nq2LkYtDSGA6o8Sm9kZmkISQwG9GiaMHy0FsNgE1iS9fDgM1cHCICKhK/H/l DlLPLDCLUeLIr2YWiHpbiWOPtoIN5RSwk+h58Z0RxBYWcJZ4dHACE4jNAtTbceoRK4jNC1S/ ueUOG4QtKPFj8j2wOcwCWhLrdx5ngrDlJTavecsMsldCQF3i0V9diLCIxL4X78DGiwgYSTxd 8pRlAqPQLCSTZiGZNAvJpFlI2hcwsqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93ECE4Cz6R2 MK5ssDjEKMDBqMTDG8DCGyzEmlhWXJl7iFGCg1lJhNfiG0+wEG9KYmVValF+fFFpTmrxIcZk oEcnMkuJJucDE1ReSbyhsYmZkaWRmYWRibk5acJK4rwHWq0DhQTSE0tSs1NTC1KLYLYwcXBK NTB2Oz7gt7P+Kz1Bgl/sRt+56z5l4ufuX/df1X/AKnGS2EbN+6v2ThI6t+h+DOsRW8Ncv7SP kromLe2298r1Dqeve3bkhKL0PaHb6x/71P63EGK8sXOT1mwh7mVpajVXdsY+EOsv69ux8vJM Kdnc80EV9u1RjnoFsXqqlwz71naeYOdcedu01luJpTgj0VCLuag4EQAYUuLURgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Fix the following checkpatch issues. ERROR: space prohibited after that open parenthesis '(' ERROR: space required before the open parenthesis '(' ERROR: trailing statements should be on next line ERROR: space required after that ',' (ctx:VxV) ERROR: spaces required around that '-=' (ctx:VxV) WARNING: sizeof *cs should be sizeof(*cs) Signed-off-by: Jingoo Han --- drivers/spi/spi-omap-100k.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 3b8b36a..c9e2282 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -128,7 +128,7 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) } spi100k_enable_clock(master); - writew( data , spi100k->base + SPI_TX_MSB); + writew(data , spi100k->base + SPI_TX_MSB); writew(SPI_CTRL_SEN(0) | SPI_CTRL_WORD_SIZE(len) | @@ -136,7 +136,8 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) spi100k->base + SPI_CTRL); /* Wait for bit ack send change */ - while((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_WE) != SPI_STATUS_WE); + while ((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_WE) != SPI_STATUS_WE) + ; udelay(1000); spi100k_disable_clock(master); @@ -144,7 +145,7 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) static int spi100k_read_data(struct spi_master *master, int len) { - int dataH,dataL; + int dataH, dataL; struct omap1_spi100k *spi100k = spi_master_get_devdata(master); /* Always do at least 16 bits */ @@ -157,7 +158,8 @@ static int spi100k_read_data(struct spi_master *master, int len) SPI_CTRL_RD, spi100k->base + SPI_CTRL); - while((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_RD) != SPI_STATUS_RD); + while ((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_RD) != SPI_STATUS_RD) + ; udelay(1000); dataL = readw(spi100k->base + SPI_RX_LSB); @@ -208,12 +210,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) rx = xfer->rx_buf; tx = xfer->tx_buf; do { - c-=1; + c -= 1; if (xfer->tx_buf != NULL) spi100k_write_data(spi->master, word_len, *tx++); if (xfer->rx_buf != NULL) *rx++ = spi100k_read_data(spi->master, word_len); - } while(c); + } while (c); } else if (word_len <= 16) { u16 *rx; const u16 *tx; @@ -221,12 +223,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) rx = xfer->rx_buf; tx = xfer->tx_buf; do { - c-=2; + c -= 2; if (xfer->tx_buf != NULL) - spi100k_write_data(spi->master,word_len, *tx++); + spi100k_write_data(spi->master, word_len, *tx++); if (xfer->rx_buf != NULL) - *rx++ = spi100k_read_data(spi->master,word_len); - } while(c); + *rx++ = spi100k_read_data(spi->master, word_len); + } while (c); } else if (word_len <= 32) { u32 *rx; const u32 *tx; @@ -234,12 +236,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) rx = xfer->rx_buf; tx = xfer->tx_buf; do { - c-=4; + c -= 4; if (xfer->tx_buf != NULL) - spi100k_write_data(spi->master,word_len, *tx); + spi100k_write_data(spi->master, word_len, *tx); if (xfer->rx_buf != NULL) - *rx = spi100k_read_data(spi->master,word_len); - } while(c); + *rx = spi100k_read_data(spi->master, word_len); + } while (c); } return count - c; } @@ -281,7 +283,7 @@ static int omap1_spi100k_setup(struct spi_device *spi) spi100k = spi_master_get_devdata(spi->master); if (!cs) { - cs = kzalloc(sizeof *cs, GFP_KERNEL); + cs = kzalloc(sizeof(*cs), GFP_KERNEL); if (!cs) return -ENOMEM; cs->base = spi100k->base + spi->chip_select * 0x14; @@ -398,14 +400,14 @@ static int omap1_spi100k_probe(struct platform_device *pdev) if (!pdev->id) return -EINVAL; - master = spi_alloc_master(&pdev->dev, sizeof *spi100k); + master = spi_alloc_master(&pdev->dev, sizeof(*spi100k)); if (master == NULL) { dev_dbg(&pdev->dev, "master allocation failed\n"); return -ENOMEM; } if (pdev->id != -1) - master->bus_num = pdev->id; + master->bus_num = pdev->id; master->setup = omap1_spi100k_setup; master->transfer_one_message = omap1_spi100k_transfer_one_message;