struct bio_integrity_payload is defined unconditionally. No need to
return void * from bio_integrity() and bio_integrity_alloc().
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
include/linux/bio-integrity.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h
index 0912f47f1d1eea..7b6e687d436de2 100644
--- a/include/linux/bio-integrity.h
+++ b/include/linux/bio-integrity.h
@@ -84,7 +84,7 @@ void bio_integrity_init(void);
#else /* CONFIG_BLK_DEV_INTEGRITY */
-static inline void *bio_integrity(struct bio *bio)
+static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
{
return NULL;
}
@@ -134,8 +134,8 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
return false;
}
-static inline void *bio_integrity_alloc(struct bio * bio, gfp_t gfp,
- unsigned int nr)
+static inline struct bio_integrity_payload *
+bio_integrity_alloc(struct bio * bio, gfp_t gfp, unsigned int nr)
{
return ERR_PTR(-EINVAL);
}
--
2.43.0
