Merge tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / include / linux / bsg.h

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index dac37b6..1ac81c8 100644 (file)
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -4,36 +4,16 @@
 
 #include <uapi/linux/bsg.h>
 
-struct request;
+struct bsg_device;
+struct device;
+struct request_queue;
 
-#ifdef CONFIG_BLK_DEV_BSG
-struct bsg_ops {
-       int     (*check_proto)(struct sg_io_v4 *hdr);
-       int     (*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,
-                               fmode_t mode);
-       int     (*complete_rq)(struct request *rq, struct sg_io_v4 *hdr);
-       void    (*free_rq)(struct request *rq);
-};
+typedef int (bsg_sg_io_fn)(struct request_queue *, struct sg_io_v4 *hdr,
+               fmode_t mode, unsigned int timeout);
 
-struct bsg_class_device {
-       struct device *class_dev;
-       int minor;
-       struct request_queue *queue;
-       const struct bsg_ops *ops;
-};
+struct bsg_device *bsg_register_queue(struct request_queue *q,
+               struct device *parent, const char *name,
+               bsg_sg_io_fn *sg_io_fn);
+void bsg_unregister_queue(struct bsg_device *bcd);
 
-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 /* _LINUX_BSG_H */