From patchwork Fri Mar 11 07:25:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 8562491 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D7EF39F6E4 for ; Fri, 11 Mar 2016 07:25:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C0F02035E for ; Fri, 11 Mar 2016 07:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1698520373 for ; Fri, 11 Mar 2016 07:25:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934180AbcCKHZ3 (ORCPT ); Fri, 11 Mar 2016 02:25:29 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:51712 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075AbcCKHZ3 (ORCPT ); Fri, 11 Mar 2016 02:25:29 -0500 Received: from 110-170-137-253.static.asianet.co.th ([110.170.137.253] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aeHRu-0002t9-PB; Fri, 11 Mar 2016 07:25:27 +0000 Received: from broonie by finisterre with local (Exim 4.86) (envelope-from ) id 1aeHRr-00031b-CD; Fri, 11 Mar 2016 14:25:23 +0700 From: Mark Brown To: Javier Martinez Canillas , Mark Brown Cc: linux-spi@vger.kernel.org In-Reply-To: <1457632874-11250-2-git-send-email-javier@osg.samsung.com> Message-Id: Date: Fri, 11 Mar 2016 14:25:23 +0700 X-SA-Exim-Connect-IP: 110.170.137.253 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: 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 Subject: Applied "spi: Fix htmldocs build error due struct spi_replaced_transfers" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: Fix htmldocs build error due struct spi_replaced_transfers has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From c76d9ae415f1a80489a76ea41620c3f17383b7fb Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 10 Mar 2016 15:01:13 -0300 Subject: [PATCH] spi: Fix htmldocs build error due struct spi_replaced_transfers The kernel-doc has to be just before the structure definition but the one for struct spi_replaced_transfers was before a structure declaration and that confuses kernel-doc which complains with the following build error: .//include/linux/spi/spi.h:933: error: Cannot parse struct or union! Signed-off-by: Javier Martinez Canillas Signed-off-by: Mark Brown --- include/linux/spi/spi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 3c02b4d06268..1fc33db4347f 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -898,6 +898,10 @@ spi_max_transfer_size(struct spi_device *spi) /* SPI transfer replacement methods which make use of spi_res */ +struct spi_replaced_transfers; +typedef void (*spi_replaced_release_t)(struct spi_master *master, + struct spi_message *msg, + struct spi_replaced_transfers *res); /** * struct spi_replaced_transfers - structure describing the spi_transfer * replacements that have occurred @@ -917,10 +921,6 @@ spi_max_transfer_size(struct spi_device *spi) * if some extra allocation is requested, so alignment will be the same * as for spi_transfers */ -struct spi_replaced_transfers; -typedef void (*spi_replaced_release_t)(struct spi_master *master, - struct spi_message *msg, - struct spi_replaced_transfers *res); struct spi_replaced_transfers { spi_replaced_release_t release; void *extradata;