memstick: don't allow REQ_TYPE_BLOCK_PC requests

There is no code to issue or handle REQ_TYPE_BLOCK_PC request in the
memstick drivers, so remove the bogus conditional.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 0fc43c7cc93c86deddd8f184c91e8ca0d8863d13..40bb8ae5853c7f5b8c8b0f74db57463a6bfa72df 100644 (file)
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -2002,8 +2002,7 @@ static int msb_bd_getgeo(struct block_device *bdev,
 
 static int msb_prepare_req(struct request_queue *q, struct request *req)
 {
-       if (req->cmd_type != REQ_TYPE_FS &&
-                               req->cmd_type != REQ_TYPE_BLOCK_PC) {
+       if (req->cmd_type != REQ_TYPE_FS) {
                blk_dump_rq_flags(req, "MS unsupported request");
                return BLKPREP_KILL;
        }

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 25b66c54045798a6cd17b3dbe0bfce489b548305..c1472275fe57a7aba494e894671de96afa03a7f3 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -829,8 +829,7 @@ static void mspro_block_start(struct memstick_dev *card)
 
 static int mspro_block_prepare_req(struct request_queue *q, struct request *req)
 {
-       if (req->cmd_type != REQ_TYPE_FS &&
-           req->cmd_type != REQ_TYPE_BLOCK_PC) {
+       if (req->cmd_type != REQ_TYPE_FS) {
                blk_dump_rq_flags(req, "MSPro unsupported request");
                return BLKPREP_KILL;
        }