aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2017-02-15 05:45:07 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-05-23 02:06:58 -0400
commita166c368e7dbc84a5d8f013d9fda99f47f9c9f13 (patch)
treec6e16d75453221b62407f766f98120e2d4a28daf
parent199652309a4d6635fca19d7528d73ab9e219bd9a (diff)
s390/cio: add test for ccwgroup device
Add a test to check if a given device is a ccwgroup device. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/ccwgroup.h10
-rw-r--r--drivers/s390/cio/ccwgroup.c6
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index 99aa817dad32..860cab7479c3 100644
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -73,4 +73,14 @@ extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev);
73 73
74#define to_ccwgroupdev(x) container_of((x), struct ccwgroup_device, dev) 74#define to_ccwgroupdev(x) container_of((x), struct ccwgroup_device, dev)
75#define to_ccwgroupdrv(x) container_of((x), struct ccwgroup_driver, driver) 75#define to_ccwgroupdrv(x) container_of((x), struct ccwgroup_driver, driver)
76
77#if IS_ENABLED(CONFIG_CCWGROUP)
78bool dev_is_ccwgroup(struct device *dev);
79#else /* CONFIG_CCWGROUP */
80static inline bool dev_is_ccwgroup(struct device *dev)
81{
82 return false;
83}
84#endif /* CONFIG_CCWGROUP */
85
76#endif 86#endif
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 5535312602af..db9c854088bc 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -561,6 +561,12 @@ static struct bus_type ccwgroup_bus_type = {
561 .pm = &ccwgroup_pm_ops, 561 .pm = &ccwgroup_pm_ops,
562}; 562};
563 563
564bool dev_is_ccwgroup(struct device *dev)
565{
566 return dev->bus == &ccwgroup_bus_type;
567}
568EXPORT_SYMBOL(dev_is_ccwgroup);
569
564/** 570/**
565 * ccwgroup_driver_register() - register a ccw group driver 571 * ccwgroup_driver_register() - register a ccw group driver
566 * @cdriver: driver to be registered 572 * @cdriver: driver to be registered