From patchwork Thu Feb 18 20:12:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 8354111 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 241D19F38B for ; Thu, 18 Feb 2016 20:12:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A26B220397 for ; Thu, 18 Feb 2016 20:12:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03FC3203DC for ; Thu, 18 Feb 2016 20:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757145AbcBRUMj (ORCPT ); Thu, 18 Feb 2016 15:12:39 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:46056 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757144AbcBRUMg (ORCPT ); Thu, 18 Feb 2016 15:12:36 -0500 Received: from debutante.sirena.org.uk ([2a01:348:6:8808:fab::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aWUwC-0007d9-As; Thu, 18 Feb 2016 20:12:32 +0000 Received: from broonie by debutante with local (Exim 4.86) (envelope-from ) id 1aWUw9-0003lS-DO; Thu, 18 Feb 2016 20:12:29 +0000 From: Mark Brown To: Martin Sperl , Mark Brown Cc: linux-spi@vger.kernel.org In-Reply-To: <1455810791-3669-1-git-send-email-kernel@martin.sperl.org> Message-Id: Date: Thu, 18 Feb 2016 20:12:29 +0000 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 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: docbook: fix parsing error" 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: docbook: fix parsing error 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 d6497816836da321a46c0e8575c4fa3d0c672bda Mon Sep 17 00:00:00 2001 From: Martin Sperl Date: Thu, 18 Feb 2016 15:53:10 +0000 Subject: [PATCH] spi: docbook: fix parsing error Fixes docbook parsing error because documentation is not directly followed by the structure, but typedef used in structure. Reordering should solve that issue. Signed-off-by: Martin Sperl Signed-off-by: Mark Brown --- include/linux/spi/spi.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 38204b584dc5..5396ee5fc51f 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -586,6 +586,10 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); * SPI resource management while processing a SPI message */ +typedef void (*spi_res_release_t)(struct spi_master *master, + struct spi_message *msg, + void *res); + /** * struct spi_res - spi resource management structure * @entry: list entry @@ -595,9 +599,6 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); * this is based on ideas from devres, but focused on life-cycle * management during spi_message processing */ -typedef void (*spi_res_release_t)(struct spi_master *master, - struct spi_message *msg, - void *res); struct spi_res { struct list_head entry; spi_res_release_t release;