The patch titled
IDE: fix ide.h compiler warning
has been removed from the -mm tree. Its filename was
ide-fix-ideh-compiler-warning.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: IDE: fix ide.h compiler warning
From: Jiri Slaby <jirislaby@xxxxxxxxx>
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 <jirislaby@xxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/ide.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN include/linux/ide.h~ide-fix-ideh-compiler-warning include/linux/ide.h
--- a/include/linux/ide.h~ide-fix-ideh-compiler-warning
+++ a/include/linux/ide.h
@@ -1009,7 +1009,10 @@ unsigned long ide_pci_dma_base(ide_hwif_
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 *);
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
git-drm.patch
input-add-debouncing-for-generic-gpio-input-device-gpio_keyc.patch
input-add-debouncing-for-generic-gpio-input-device-gpio_keyc-update.patch
wdev-ath5k-typecheck-on-nondebug.patch
x86_32-fix-fault_msg-nul-termination.patch
capabilities-implement-per-process-securebits-fix.patch
misc-phantom-add-compat-ioctl.patch
misc-phantom-add-compat-ioctl-checkpatch-fixes.patch
misc-phantom-fix-poll.patch
misc-phantom-consistent-whitespace.patch
mxser-prepare-for-bkl-pushdown.patch
tty-bkl-pushdown-fix.patch
tty-bkl-pushdown-fix1.patch
char-moxa-remove-static-isa-support.patch
char-moxa-cleanup-module-param-passed-isa-init.patch
char-moxa-pci-io-space-fixup.patch
char-moxa-fix-tiocg-ssoftcar-param.patch
char-moxa-add-firmware-loading.patch
char-moxa-merge-c2xx-and-c320-firmware-loading.patch
char-moxa-remove-port-port.patch
char-moxa-remove-unused-port-entries.patch
char-moxa-centralize-board-readiness.patch
char-moxa-timer-cleanup.patch
char-moxa-ioctl-cleanup.patch
char-moxa-merge-2-poll-functions.patch
char-moxa-cleanup-rx-tx.patch
char-moxa-serialise-timer.patch
char-moxa-rework-open-close.patch
char-moxa-little-cleanup.patch
char-moxa-remove-useless-tty-functions.patch
char-moxa-introduce-moxa_is_320-macro.patch
char-moxa-notify-about-board-readiness.patch
char-moxa-update-credits.patch
char-moxa-add-firmware-loading-fix.patch
char-espc-fix-possible-double-unlock.patch
mxser-convert-large-macros-to-functions.patch
reiser4.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
