projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ide
/
ide-gd.h
diff --git
a/drivers/ide/ide-gd.h
b/drivers/ide/ide-gd.h
index b604bdd318a1294a6e7cb8c9d2addcca68f8759d..55970772bd04cc3e9f83681740ba5de2b2ee0635 100644
(file)
--- a/
drivers/ide/ide-gd.h
+++ b/
drivers/ide/ide-gd.h
@@
-8,7
+8,7
@@
#define IDE_GD_DEBUG_LOG 0
#if IDE_GD_DEBUG_LOG
#define IDE_GD_DEBUG_LOG 0
#if IDE_GD_DEBUG_LOG
-#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)
+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt,
##
args)
#else
#define ide_debug_log(lvl, fmt, args...) do {} while (0)
#endif
#else
#define ide_debug_log(lvl, fmt, args...) do {} while (0)
#endif
@@
-20,8
+20,6
@@
struct ide_disk_obj {
struct device dev;
unsigned int openers; /* protected by BKL for now */
struct device dev;
unsigned int openers; /* protected by BKL for now */
- /* Last failed packet command */
- struct ide_atapi_pc *failed_pc;
/* used for blk_{fs,pc}_request() requests */
struct ide_atapi_pc queued_pc;
/* used for blk_{fs,pc}_request() requests */
struct ide_atapi_pc queued_pc;