summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-04-28 01:21:32 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2023-04-28 01:21:32 +0200
commitd06f5a3f7140921ada47d49574ae6fa4de5e2a89 (patch)
tree43d53ab69dc67a0732b73db8cf81ca2d2f523ecb
parentMerge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-d06f5a3f7140921ada47d49574ae6fa4de5e2a89.tar.xz
linux-d06f5a3f7140921ada47d49574ae6fa4de5e2a89.zip
cdx: fix build failure due to sysfs 'bus_type' argument needing to be const
Commit 75cff725d956 ("driver core: bus: mark the struct bus_type for sysfs callbacks as constant") missed at least one case - the CDX bus driver. Probably because Greg didn't notice the build failure, because it only ends up being enabled on arm64. And I missed it during the merge, because while I do arm64 builds these days, I don't do them in between each pull. So it took a while for me to notice the breakage, rather than me just fixing it in the driver core merge that brought this failure case in. Maybe we should remove the CDX_BUS dependency on arm64 when COMPILE_TEST is on? Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Nipun Gupta <nipun.gupta@amd.com> Cc: Nikhil Agarwal <nikhil.agarwal@amd.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/cdx/cdx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
index 67c32cb2c006..38511fd36325 100644
--- a/drivers/cdx/cdx.c
+++ b/drivers/cdx/cdx.c
@@ -363,7 +363,7 @@ static struct attribute *cdx_dev_attrs[] = {
};
ATTRIBUTE_GROUPS(cdx_dev);
-static ssize_t rescan_store(struct bus_type *bus,
+static ssize_t rescan_store(const struct bus_type *bus,
const char *buf, size_t count)
{
struct cdx_controller *cdx;