Skip to contentSkip to conversation

scsi: aacraid: fix -Wcast-function-type

PATCH Superseded Phong Tran 5 participants 9 messages Mar 7, 2020 – Mar 11, 2020

Subsystems (2)
lore
Share & tools
lore

Phong Tran

author
#0 lore raw

PATCH 1/1 scsi: aacraid: fix -Wcast-function-type

correct usage prototype of callback scsi_cmnd.scsi_done() Report by: https://github.com/KSPP/linux/issues/20

---
 drivers/scsi/aacraid/aachba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +6 -1
index 33dbc051bff9..92a1058df3f5 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
 	return 0;
 }
 
+static void  aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
 int aac_probe_container(struct aac_dev *dev, int cid)
 {
 	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
 		return -ENOMEM;
 	}
 	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = (void (*)(struct scsi_cmnd *))aac_probe_container_scsi_done;
 
 	scsicmd->device = scsidev;
 	scsidev->sdev_state = 0;
Signature · 1 line
2.20.1
#1 lore raw
Quoted 26 lines · Phong Tran

correct usage prototype of callback scsi_cmnd.scsi_done() Report by: https://github.com/KSPP/linux/issues/20

---
 drivers/scsi/aacraid/aachba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +5 -0
index 33dbc051bff9..92a1058df3f5 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
 	return 0;
 }
 
+static void  aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
 int aac_probe_container(struct aac_dev *dev, int cid)
 {
 	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);

drivers/scsi/aacraid/aachba.c int aac_probe_container(struct aac_dev *dev, int cid) · line 821

Quoted 8 lines
drivers/scsi/aacraid/aachba.c +1 -1
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
 		return -ENOMEM;
 	}
 	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = (void (*)(struct scsi_cmnd *))aac_probe_container_scsi_done;
 
 	scsicmd->device = scsidev;
 	scsidev->sdev_state = 0;

Since the above cast is not necessary, please remove it.

Thanks,

Bart.

author
#2 lore raw
Quoted 32 lines · Bart Van Assche
Quoted 31 lines · Phong Tran

correct usage prototype of callback scsi_cmnd.scsi_done() Report by: https://github.com/KSPP/linux/issues/20

---
  drivers/scsi/aacraid/aachba.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +6 -1
index 33dbc051bff9..92a1058df3f5 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
  	return 0;
  }
 
+static void  aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
  int aac_probe_container(struct aac_dev *dev, int cid)
  {
  	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
  		return -ENOMEM;
  	}
  	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = (void (*)(struct scsi_cmnd *))aac_probe_container_scsi_done;
 
Quoted 6 lines

drivers/scsi/aacraid/aachba.c int aac_probe_container(struct aac_dev *dev, int cid) · line 821

Quoted 3 lines
drivers/scsi/aacraid/aachba.c +0 -0
  	scsicmd->device = scsidev;
  	scsidev->sdev_state = 0;

Since the above cast is not necessary, please remove it.

yes, sent v2.

Regards,

Phong.

Quoted 4 lines

Thanks,

Bart.

author
#3 lore raw

PATCH v2 1/1 scsi: aacraid: fix -Wcast-function-type

In reply to Phong Tran

correct usage prototype of callback scsi_cmnd.scsi_done() Report by: https://github.com/KSPP/linux/issues/20

---
 drivers/scsi/aacraid/aachba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +6 -1
index 33dbc051bff9..20ca3647d211 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
 	return 0;
 }
 
+static void  aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
 int aac_probe_container(struct aac_dev *dev, int cid)
 {
 	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
 		return -ENOMEM;
 	}
 	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = aac_probe_container_scsi_done;
 
 	scsicmd->device = scsidev;
 	scsidev->sdev_state = 0;
Signature · 1 line
2.20.1
#5 lore raw
In reply to Phong Tran
Quoted 3 lines · Phong Tran

correct usage prototype of callback scsi_cmnd.scsi_done() Report by: https://github.com/KSPP/linux/issues/20

no harm to add:

drivers/scsi/aacraid/aachba.c:813:23: warning: cast between incompatible function types from ‘int (*)(struct scsi_cmnd *)’ to ‘void (*)(struct scsi_cmnd *)’ [-Wcast-function-type]

Quoted 10 lines
---
  drivers/scsi/aacraid/aachba.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +0 -0
index 33dbc051bff9..20ca3647d211 100644

drivers/scsi/aacraid/aachba.c static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd) · line 801

Quoted 4 lines
drivers/scsi/aacraid/aachba.c +1 -0
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
  	return 0;
  }
 
+static void  aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)

supernit: double whitespace

Quoted 17 lines
drivers/scsi/aacraid/aachba.c +5 -1
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
  int aac_probe_container(struct aac_dev *dev, int cid)
  {
  	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
  		return -ENOMEM;
  	}
  	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = aac_probe_container_scsi_done;
 
  	scsicmd->device = scsidev;
  	scsidev->sdev_state = 0;
author
#6 lore raw

PATCH v3 1/1 scsi: aacraid: cleanup warning cast-function-type

Make the aacraid driver -Wcast-function-type clean Report by: https://github.com/KSPP/linux/issues/20

drivers/scsi/aacraid/aachba.c:813:23:
warning: cast between incompatible function types from 'int (*)(struct scsi_cmnd *)' to 'void (*)(struct scsi_cmnd *)' [-Wcast-function-type]

---
 drivers/scsi/aacraid/aachba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +6 -1
index 33dbc051bff9..ebfb42af67f5 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
 	return 0;
 }
 
+static void aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
 int aac_probe_container(struct aac_dev *dev, int cid)
 {
 	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
 		return -ENOMEM;
 	}
 	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = aac_probe_container_scsi_done;
 
 	scsicmd->device = scsidev;
 	scsidev->sdev_state = 0;
Signature · 1 line
2.20.1
Reviewed-by on v3 1/1
#7 lore raw

Re: [PATCH v3] scsi: aacraid: cleanup warning cast-function-type

Quoted 10 lines · Phong Tran

Make the aacraid driver -Wcast-function-type clean Report by: https://github.com/KSPP/linux/issues/20

drivers/scsi/aacraid/aachba.c:813:23:
warning: cast between incompatible function types from 'int (*)(struct scsi_cmnd *)' to 'void (*)(struct scsi_cmnd *)' [-Wcast-function-type]

-Kees

Quoted 32 lines
---
 drivers/scsi/aacraid/aachba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/aachba.c +6 -1
index 33dbc051bff9..ebfb42af67f5 100644
@@ -798,6 +798,11 @@ static int aac_probe_container_callback1(struct scsi_cmnd * scsicmd)
 	return 0;
 }
 
+static void aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)
+{
+	aac_probe_container_callback1(scsi_cmnd);
+}
+
 int aac_probe_container(struct aac_dev *dev, int cid)
 {
 	struct scsi_cmnd *scsicmd = kmalloc(sizeof(*scsicmd), GFP_KERNEL);
@@ -810,7 +815,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
 		return -ENOMEM;
 	}
 	scsicmd->list.next = NULL;
-	scsicmd->scsi_done = (void (*)(struct scsi_cmnd*))aac_probe_container_callback1;
+	scsicmd->scsi_done = aac_probe_container_scsi_done;
 
 	scsicmd->device = scsidev;
 	scsidev->sdev_state = 0;
Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook