From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335AbYCPQCs (ORCPT ); Sun, 16 Mar 2008 12:02:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751926AbYCPQCj (ORCPT ); Sun, 16 Mar 2008 12:02:39 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:32930 "EHLO WNmonitoring" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751538AbYCPQCi (ORCPT ); Sun, 16 Mar 2008 12:02:38 -0400 From: Jiri Slaby To: Andrew Morton Cc: , Jiri Slaby , Bartlomiej Zolnierkiewicz Subject: [PATCH 1/1] IDE: fix ide.h compiler warning Date: Sun, 16 Mar 2008 17:01:58 +0100 Message-Id: <1205683318-1409-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.5.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix following compiler warning by returning EINVAL In file included from ANYTHING-INCLUDING-IDE.H:45: include/linux/ide.h: In function ‘ide_hwif_setup_dma’: include/linux/ide.h:1022: warning: no return statement in function returning non-void This fix is only for CONFIG_BLK_DEV_IDEDMA_PCI=n configs and is introduced by ide: do complete DMA setup in ->init_dma method. Signed-off-by: Jiri Slaby Cc: Bartlomiej Zolnierkiewicz --- include/linux/ide.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/linux/ide.h b/include/linux/ide.h index 83ddaf0..bd8d751 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1016,7 +1016,10 @@ unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *); int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); #else static inline int ide_hwif_setup_dma(ide_hwif_t *hwif, - const struct ide_port_info *d) { } + const struct ide_port_info *d) +{ + return -EINVAL; +} #endif extern void default_hwif_iops(ide_hwif_t *); -- 1.5.4.1