usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver

Deprecate this driver. All devices which can be handled by this driver
can also be handled by the usb-storage driver.

Acked-By: Pete Zaitcev <zaitcev@redhat.com>
Cc: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a0ffac029a0dc703322d922f3ec59435e3315ef3..d5dc80f303527b8c8212f756b460facd8595444f 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -524,3 +524,14 @@ Files:     arch/arm/mach-at91/at91cap9.c
 Why:   The code is not actively maintained and platforms are now hard to find.
 Who:   Nicolas Ferre <nicolas.ferre@atmel.com>
        Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+----------------------------
+
+What:  Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")
+When:  3.6
+Why:   This driver provides support for USB storage devices like "USB
+       sticks". As of now, it is deactivated in Debian, Fedora and
+        Ubuntu. All current users can switch over to usb-storage
+        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI
+        stack.
+Who:   Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4e4c8a4a5fd3fb4412a19fdbd3f62647b285fd6a..a796407123c714174c006f228b1e8e189be2295a 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -354,7 +354,7 @@ config BLK_DEV_SX8
          Use devices /dev/sx8/$N and /dev/sx8/$Np$M.
 
 config BLK_DEV_UB
-       tristate "Low Performance USB Block driver"
+       tristate "Low Performance USB Block driver (deprecated)"
        depends on USB
        help
          This driver supports certain USB attached storage devices

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 298ac75ac8e51bc69c72809ae7c48f0c19c86dc0..fcec0225ac764abf81c6a5038df3d4e319ca6fa8 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -2440,6 +2440,8 @@ static int __init ub_init(void)
        int rc;
        int i;
 
+       pr_info("'Low Performance USB Block' driver is deprecated. "
+                       "Please switch to usb-storage\n");
        for (i = 0; i < UB_QLOCK_NUM; i++)
                spin_lock_init(&ub_qlockv[i]);