summaryrefslogtreecommitdiff
path: root/include/linux/bsg.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-07-24 10:20:23 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2021-07-29 05:24:26 +0300
commit78011042684dfbb50f7060f4623793f7a5c74a01 (patch)
tree07d91ef3f7feec1ced179e4d5348ee14e7801c07 /include/linux/bsg.h
parentd52fe8f436a6d9850b5e528cb94a651563a77374 (diff)
downloadlinux-78011042684dfbb50f7060f4623793f7a5c74a01.tar.xz
scsi: bsg: Move bsg_scsi_ops to drivers/scsi/
Move the SCSI-specific bsg code in the SCSI midlayer instead of in the common bsg code. This just keeps the common bsg code block/ and also allows building it as a module. Link: https://lore.kernel.org/r/20210724072033.1284840-15-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/linux/bsg.h')
-rw-r--r--include/linux/bsg.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index dac37b6e00ec..b887da20bd41 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -5,8 +5,9 @@
#include <uapi/linux/bsg.h>
struct request;
+struct request_queue;
-#ifdef CONFIG_BLK_DEV_BSG
+#ifdef CONFIG_BLK_DEV_BSG_COMMON
struct bsg_ops {
int (*check_proto)(struct sg_io_v4 *hdr);
int (*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,
@@ -24,16 +25,10 @@ struct bsg_class_device {
int bsg_register_queue(struct request_queue *q, struct device *parent,
const char *name, const struct bsg_ops *ops);
-int bsg_scsi_register_queue(struct request_queue *q, struct device *parent);
void bsg_unregister_queue(struct request_queue *q);
#else
-static inline int bsg_scsi_register_queue(struct request_queue *q,
- struct device *parent)
-{
- return 0;
-}
static inline void bsg_unregister_queue(struct request_queue *q)
{
}
-#endif /* CONFIG_BLK_DEV_BSG */
+#endif /* CONFIG_BLK_DEV_BSG_COMMON */
#endif /* _LINUX_BSG_H */