linux-next: build failure after merge of the vhost tree

[Stephen Rothwell]

Hi all,

After merging the vhost tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/block/virtio_blk.c:986:14: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
  986 |  .probe    = virtblk_probe,
      |              ^~~~~~~~~~~~~
drivers/block/virtio_blk.c:986:14: note: (near initialization for 'virtio_blk.probe')
drivers/char/virtio_console.c:2213:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 2213 |  .probe = virtcons_probe,
      |           ^~~~~~~~~~~~~~
drivers/char/virtio_console.c:2213:11: note: (near initialization for 'virtio_console.probe')
drivers/char/virtio_console.c:2228:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 2228 |  .probe = virtcons_probe,
      |           ^~~~~~~~~~~~~~
drivers/char/virtio_console.c:2228:11: note: (near initialization for 'virtio_rproc_serial.probe')
drivers/scsi/virtio_scsi.c:983:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
  983 |  .probe = virtscsi_probe,
      |           ^~~~~~~~~~~~~~
drivers/scsi/virtio_scsi.c:983:11: note: (near initialization for 'virtio_scsi_driver.probe')
drivers/net/virtio_net.c: At top level:
drivers/net/virtio_net.c:3387:14: error: initialization of 'void * (*)(struct virtio_device *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 3387 |  .validate = virtnet_validate,
      |              ^~~~~~~~~~~~~~~~
drivers/net/virtio_net.c:3387:14: note: (near initialization for 'virtio_net_driver.validate')
drivers/net/virtio_net.c:3388:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 3388 |  .probe = virtnet_probe,
      |           ^~~~~~~~~~~~~
drivers/net/virtio_net.c:3388:11: note: (near initialization for 'virtio_net_driver.probe')

Caused by commit

  e397242b72e2 ("virtio: allow passing config data from validate callback")

I have used the vhost tree from next-20210707 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp7o9UcazvWy.pgp
Description: OpenPGP digital signature