Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / s390 / cio / css.c

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index e1f2d0eed544c0b318e9a59add5a329f2dbb52d5..22c55816100be456528ac25027d13c916643b0da 100644 (file)
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -491,10 +491,10 @@ static int css_probe_device(struct subchannel_id schid, struct schib *schib)
 }
 
 static int
-check_subchannel(struct device * dev, void * data)
+check_subchannel(struct device *dev, const void *data)
 {
        struct subchannel *sch;
-       struct subchannel_id *schid = data;
+       struct subchannel_id *schid = (void *)data;
 
        sch = to_subchannel(dev);
        return schid_equal(&sch->schid, schid);