[GIT PULL] s390 updates for 5.17-rc4

[Vasily Gorbik]

Hello Linus,

please pull s390 changes for 5.17-rc4.

Thank you,
Vasily

The following changes since commit dfd42facf1e4ada021b939b4e19c935dcdd55566:

  Linux 5.17-rc3 (2022-02-06 12:20:50 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.17-4

for you to fetch changes up to dd9cb842fa9d90653a9b48aba52f89c069f3bc50:

  s390/cio: verify the driver availability for path_event call (2022-02-09 22:55:01 +0100)

----------------------------------------------------------------
s390 updates for 5.17-rc4

- Maintainers and reviewers changes:
  - Add Alexander Gordeev as maintainer for s390.
  - Christian Borntraeger will focus on s390 KVM maintainership and
    stays as s390 reviewer.

- Fix clang build of modules loader KUnit test.

- Fix kernel panic in CIO code on FCES path-event when no driver is
  attached to a device or the driver does not provide the path_event
  function.

----------------------------------------------------------------
Christian Borntraeger (1):
      MAINTAINERS: downgrade myself to Reviewer for s390

Heiko Carstens (1):
      MAINTAINERS: add Alexander Gordeev as maintainer for s390

Ilya Leoshkevich (1):
      s390/module: fix building test_modules_helpers.o with clang

Vineeth Vijayan (1):
      s390/cio: verify the driver availability for path_event call

 MAINTAINERS                  | 4 ++--
 arch/s390/lib/test_modules.c | 3 ---
 arch/s390/lib/test_modules.h | 3 +++
 drivers/s390/cio/device.c    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 69a2935daf6c..5c56a172ce11 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16817,8 +16817,8 @@ F:	drivers/video/fbdev/savage/
 S390
 M:	Heiko Carstens <hca@xxxxxxxxxxxxx>
 M:	Vasily Gorbik <gor@xxxxxxxxxxxxx>
-M:	Christian Borntraeger <borntraeger@xxxxxxxxxxxxx>
-R:	Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
+M:	Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
+R:	Christian Borntraeger <borntraeger@xxxxxxxxxxxxx>
 R:	Sven Schnelle <svens@xxxxxxxxxxxxx>
 L:	linux-s390@xxxxxxxxxxxxxxx
 S:	Supported
diff --git a/arch/s390/lib/test_modules.c b/arch/s390/lib/test_modules.c
index d056baa8fbb0..9894009fc1f2 100644
--- a/arch/s390/lib/test_modules.c
+++ b/arch/s390/lib/test_modules.c
@@ -5,9 +5,6 @@
 
 #include "test_modules.h"
 
-#define DECLARE_RETURN(i) int test_modules_return_ ## i(void)
-REPEAT_10000(DECLARE_RETURN);
-
 /*
  * Test that modules with many relocations are loaded properly.
  */
diff --git a/arch/s390/lib/test_modules.h b/arch/s390/lib/test_modules.h
index 43b5e4b4af3e..6371fcf17684 100644
--- a/arch/s390/lib/test_modules.h
+++ b/arch/s390/lib/test_modules.h
@@ -47,4 +47,7 @@
 	__REPEAT_10000_1(f, 8); \
 	__REPEAT_10000_1(f, 9)
 
+#define DECLARE_RETURN(i) int test_modules_return_ ## i(void)
+REPEAT_10000(DECLARE_RETURN);
+
 #endif
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index cd938a26b76c..3b1cd0c96a74 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1180,7 +1180,7 @@ static int io_subchannel_chp_event(struct subchannel *sch,
 			else
 				path_event[chpid] = PE_NONE;
 		}
-		if (cdev)
+		if (cdev && cdev->drv && cdev->drv->path_event)
 			cdev->drv->path_event(cdev, path_event);
 		break;
 	}