Fix the following compiler warning:
drivers/scsi/sr.c:686:12: warning: initialized field overwritten [-Woverride-init]
686 | .ioctl = sr_block_compat_ioctl,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/scsi/sr.c:686:12: note: (near initialization for 'sr_bdops.ioctl')
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Fixes: d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
drivers/scsi/sr.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fe0e1c721a99..9ad57a98a37f 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -556,6 +556,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode)
mutex_unlock(&cd->lock);
}
+#ifndef CONFIG_COMPAT
static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
unsigned long arg)
{
@@ -597,8 +598,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
mutex_unlock(&cd->lock);
return ret;
}
-
-#ifdef CONFIG_COMPAT
+#else /* !defined(CONFIG_COMPAT) */
static int sr_block_compat_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
unsigned long arg)
{
@@ -641,7 +641,7 @@ static int sr_block_compat_ioctl(struct block_device *bdev, fmode_t mode, unsign
return ret;
}
-#endif
+#endif /* !defined(CONFIG_COMPAT) */
static unsigned int sr_block_check_events(struct gendisk *disk,
unsigned int clearing)
@@ -685,8 +685,9 @@ static const struct block_device_operations sr_bdops =
.owner = THIS_MODULE,
.open = sr_block_open,
.release = sr_block_release,
+#ifndef CONFIG_COMPAT
.ioctl = sr_block_ioctl,
-#ifdef CONFIG_COMPAT
+#else
.ioctl = sr_block_compat_ioctl,
#endif
.check_events = sr_block_check_events,
