coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter...
authorNathan Chancellor <natechancellor@gmail.com>
Mon, 1 Jul 2019 18:28:08 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jul 2019 21:42:05 +0000 (14:42 -0700)
commit9787aed57dd33ba5c15a713c2c50e78baeb5052d
tree9545fe0a34fb5a45811ea932fba1d3cfdbcf304a
parentf632a8170a6b667ee4e3f552087588f0fe13c4bb
coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const

Fix Linus' merge error in the parent commit, causing:

  drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer types passing 'int (struct device *, void *)' to parameter of type 'int (*)(struct device *, const void *)' [-Werror,-Wincompatible-pointer-types]
                                        coresight_device_fwnode_match);
                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  include/linux/device.h:173:17: note: passing argument to parameter 'match' here
                                 int (*match)(struct device *dev, const void *data));
                                       ^

due to missed header file fixup.

Fixes: f632a8170a6b ("Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
[ Greg even sent this patch with his pull request, but I stupidly
  thought it was the merge resolution fix I had already done as part of
  the merge. But no, this was the extra fix for the header file
  that goes with the definition I _had_ caught   - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/hwtracing/coresight/coresight-priv.h