Commit 698be5d6 authored by Martin Schwidefsky's avatar Martin Schwidefsky

Merge tag 'vfio-ccw-20170522' of...

Merge tag 'vfio-ccw-20170522' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes

Pull vfio-ccw fix from Conelia Huck:
"vfio-ccw: one patch"

* Make some symbols in vfio-ccw static, as detected by sparse.
parents c0e7bb38 5bf18536
...@@ -70,14 +70,14 @@ static ssize_t name_show(struct kobject *kobj, struct device *dev, char *buf) ...@@ -70,14 +70,14 @@ static ssize_t name_show(struct kobject *kobj, struct device *dev, char *buf)
{ {
return sprintf(buf, "I/O subchannel (Non-QDIO)\n"); return sprintf(buf, "I/O subchannel (Non-QDIO)\n");
} }
MDEV_TYPE_ATTR_RO(name); static MDEV_TYPE_ATTR_RO(name);
static ssize_t device_api_show(struct kobject *kobj, struct device *dev, static ssize_t device_api_show(struct kobject *kobj, struct device *dev,
char *buf) char *buf)
{ {
return sprintf(buf, "%s\n", VFIO_DEVICE_API_CCW_STRING); return sprintf(buf, "%s\n", VFIO_DEVICE_API_CCW_STRING);
} }
MDEV_TYPE_ATTR_RO(device_api); static MDEV_TYPE_ATTR_RO(device_api);
static ssize_t available_instances_show(struct kobject *kobj, static ssize_t available_instances_show(struct kobject *kobj,
struct device *dev, char *buf) struct device *dev, char *buf)
...@@ -86,7 +86,7 @@ static ssize_t available_instances_show(struct kobject *kobj, ...@@ -86,7 +86,7 @@ static ssize_t available_instances_show(struct kobject *kobj,
return sprintf(buf, "%d\n", atomic_read(&private->avail)); return sprintf(buf, "%d\n", atomic_read(&private->avail));
} }
MDEV_TYPE_ATTR_RO(available_instances); static MDEV_TYPE_ATTR_RO(available_instances);
static struct attribute *mdev_types_attrs[] = { static struct attribute *mdev_types_attrs[] = {
&mdev_type_attr_name.attr, &mdev_type_attr_name.attr,
...@@ -100,7 +100,7 @@ static struct attribute_group mdev_type_group = { ...@@ -100,7 +100,7 @@ static struct attribute_group mdev_type_group = {
.attrs = mdev_types_attrs, .attrs = mdev_types_attrs,
}; };
struct attribute_group *mdev_type_groups[] = { static struct attribute_group *mdev_type_groups[] = {
&mdev_type_group, &mdev_type_group,
NULL, NULL,
}; };
...@@ -152,7 +152,7 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev) ...@@ -152,7 +152,7 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev)
&events, &private->nb); &events, &private->nb);
} }
void vfio_ccw_mdev_release(struct mdev_device *mdev) static void vfio_ccw_mdev_release(struct mdev_device *mdev)
{ {
struct vfio_ccw_private *private = struct vfio_ccw_private *private =
dev_get_drvdata(mdev_parent_dev(mdev)); dev_get_drvdata(mdev_parent_dev(mdev));
...@@ -233,7 +233,7 @@ static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info, ...@@ -233,7 +233,7 @@ static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info,
} }
} }
int vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info) static int vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info)
{ {
if (info->index != VFIO_CCW_IO_IRQ_INDEX) if (info->index != VFIO_CCW_IO_IRQ_INDEX)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment