[PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c
DORMANTno replies
REVIEWED: 2 (0M)
From: Palmer Dabbelt <hidden>
Date: 2015-09-14 22:50:44
Also in:
linux-arch, linux-fsdevel
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Status: Reviewed.
2 review trailers.
Possibly related (same subject, not in this thread)
- 2015-11-03 · [PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c · Palmer Dabbelt <palmer@dabbelt.com>
- 2015-11-03 · [PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c · Palmer Dabbelt <palmer@dabbelt.com>
- 2015-11-03 · [PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c · Palmer Dabbelt <palmer@dabbelt.com>
- 2015-11-03 · [PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c · Palmer Dabbelt <hidden>
- 2015-11-03 · [PATCH 10/13] Move USE_WCACHING to drivers/block/pktcdvd.c · Palmer Dabbelt <hidden>
I don't think this was ever intended to be exposed to userspace, but it did require an "#ifdef CONFIG_*". Since the name is kind of generic and was only used in one place, I've moved the definition to the one user. Signed-off-by: Palmer Dabbelt <redacted> Reviewed-by: Andrew Waterman <redacted> Reviewed-by: Albert Ou <redacted> --- drivers/block/pktcdvd.c | 11 +++++++++++ include/uapi/linux/pktcdvd.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 7be2375db7f2..18d2d05f5ac9 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c@@ -90,6 +90,17 @@ do { \ #define MAX_SPEED 0xffff +/* + * use drive write caching -- we need deferred error handling to be + * able to successfully recover with this option (drive will return good + * status as soon as the cdb is validated). + */ +#if defined(CONFIG_CDROM_PKTCDVD_WCACHE) +#define USE_WCACHING 1 +#else +#define USE_WCACHING 0 +#endif + static DEFINE_MUTEX(pktcdvd_mutex); static struct pktcdvd_device *pkt_devs[MAX_WRITERS]; static struct proc_dir_entry *pkt_proc;
diff --git a/include/uapi/linux/pktcdvd.h b/include/uapi/linux/pktcdvd.h
index 2640b9d4e243..05c2bee70d6c 100644
--- a/include/uapi/linux/pktcdvd.h
+++ b/include/uapi/linux/pktcdvd.h@@ -29,17 +29,6 @@ #define PACKET_WAIT_TIME (HZ * 5 / 1000) /* - * use drive write caching -- we need deferred error handling to be - * able to successfully recover with this option (drive will return good - * status as soon as the cdb is validated). - */ -#if defined(CONFIG_CDROM_PKTCDVD_WCACHE) -#define USE_WCACHING 1 -#else -#define USE_WCACHING 0 -#endif - -/* * No user-servicable parts beyond this point -> */
--
2.4.6