Commit 4b2dbd56 authored by Kefeng Wang's avatar Kefeng Wang Committed by Alex Williamson
Browse files

vfio-mdev/samples: make some symbols static 



Make some structs and functions static to fix build warning, parts of
warning shown below,

samples/vfio-mdev/mtty.c:730:5: warning: symbol 'mtty_create' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:780:5: warning: symbol 'mtty_remove' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:802:5: warning: symbol 'mtty_reset' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:818:9: warning: symbol 'mtty_read' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:877:9: warning: symbol 'mtty_write' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1070:5: warning: symbol 'mtty_get_region_info' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1119:5: warning: symbol 'mtty_get_irq_info' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1143:5: warning: symbol 'mtty_get_device_info' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1275:5: warning: symbol 'mtty_open' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1281:6: warning: symbol 'mtty_close' was not declared. Should it be static?
samples/vfio-mdev/mtty.c:1305:30: warning: symbol 'mtty_dev_groups' was not declared. Should it be static?

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Kirti Wankhede <kwankhede@nvidia.com>
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[aw: wrap long lines]
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 6fbc7275

samples/vfio-mdev/mtty.c

+24 −23
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
 * Global Structures

 */



struct mtty_dev {

static struct mtty_dev {

	dev_t		vd_devt;

	struct class	*vd_class;

	struct cdev	vd_cdev;
@@ -84,7 +84,7 @@ struct mdev_region_info { 
};



#if defined(DEBUG_REGS)

const char *wr_reg[] = {

static const char *wr_reg[] = {

	"TX",

	"IER",

	"FCR",
@@ -95,7 +95,7 @@ const char *wr_reg[] = { 
	"SCR"

};



const char *rd_reg[] = {

static const char *rd_reg[] = {

	"RX",

	"IER",

	"IIR",
@@ -143,8 +143,8 @@ struct mdev_state { 
	int nr_ports;

};



struct mutex mdev_list_lock;

struct list_head mdev_devices_list;

static struct mutex mdev_list_lock;

static struct list_head mdev_devices_list;



static const struct file_operations vd_fops = {

	.owner          = THIS_MODULE,
@@ -167,7 +167,7 @@ static struct mdev_state *find_mdev_state_by_uuid(const guid_t *uuid) 
	return NULL;

}



void dump_buffer(u8 *buf, uint32_t count)

static void dump_buffer(u8 *buf, uint32_t count)

{

#if defined(DEBUG)

	int i;
@@ -723,7 +723,7 @@ accessfailed: 
	return ret;

}



int mtty_create(struct kobject *kobj, struct mdev_device *mdev)

static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)

{

	struct mdev_state *mdev_state;

	char name[MTTY_STRING_LEN];
@@ -773,7 +773,7 @@ int mtty_create(struct kobject *kobj, struct mdev_device *mdev) 
	return 0;

}



int mtty_remove(struct mdev_device *mdev)

static int mtty_remove(struct mdev_device *mdev)

{

	struct mdev_state *mds, *tmp_mds;

	struct mdev_state *mdev_state = mdev_get_drvdata(mdev);
@@ -795,7 +795,7 @@ int mtty_remove(struct mdev_device *mdev) 
	return ret;

}



int mtty_reset(struct mdev_device *mdev)

static int mtty_reset(struct mdev_device *mdev)

{

	struct mdev_state *mdev_state;
@@ -811,8 +811,8 @@ int mtty_reset(struct mdev_device *mdev) 
	return 0;

}



ssize_t mtty_read(struct mdev_device *mdev, char __user *buf, size_t count,

		  loff_t *ppos)

static ssize_t mtty_read(struct mdev_device *mdev, char __user *buf,

			 size_t count, loff_t *ppos)

{

	unsigned int done = 0;

	int ret;
@@ -870,7 +870,7 @@ read_err: 
	return -EFAULT;

}



ssize_t mtty_write(struct mdev_device *mdev, const char __user *buf,

static ssize_t mtty_write(struct mdev_device *mdev, const char __user *buf,

		   size_t count, loff_t *ppos)

{

	unsigned int done = 0;
@@ -1063,7 +1063,7 @@ static int mtty_trigger_interrupt(const guid_t *uuid) 
	return ret;

}



int mtty_get_region_info(struct mdev_device *mdev,

static int mtty_get_region_info(struct mdev_device *mdev,

			 struct vfio_region_info *region_info,

			 u16 *cap_type_id, void **cap_type)

{
@@ -1112,7 +1112,8 @@ int mtty_get_region_info(struct mdev_device *mdev, 
	return 0;

}



int mtty_get_irq_info(struct mdev_device *mdev, struct vfio_irq_info *irq_info)

static int mtty_get_irq_info(struct mdev_device *mdev,

			     struct vfio_irq_info *irq_info)

{

	switch (irq_info->index) {

	case VFIO_PCI_INTX_IRQ_INDEX:
@@ -1136,7 +1137,7 @@ int mtty_get_irq_info(struct mdev_device *mdev, struct vfio_irq_info *irq_info) 
	return 0;

}



int mtty_get_device_info(struct mdev_device *mdev,

static int mtty_get_device_info(struct mdev_device *mdev,

			 struct vfio_device_info *dev_info)

{

	dev_info->flags = VFIO_DEVICE_FLAGS_PCI;
@@ -1268,13 +1269,13 @@ static long mtty_ioctl(struct mdev_device *mdev, unsigned int cmd, 
	return -ENOTTY;

}



int mtty_open(struct mdev_device *mdev)

static int mtty_open(struct mdev_device *mdev)

{

	pr_info("%s\n", __func__);

	return 0;

}



void mtty_close(struct mdev_device *mdev)

static void mtty_close(struct mdev_device *mdev)

{

	pr_info("%s\n", __func__);

}
@@ -1298,7 +1299,7 @@ static const struct attribute_group mtty_dev_group = { 
	.attrs = mtty_dev_attrs,

};



const struct attribute_group *mtty_dev_groups[] = {

static const struct attribute_group *mtty_dev_groups[] = {

	&mtty_dev_group,

	NULL,

};
@@ -1325,7 +1326,7 @@ static const struct attribute_group mdev_dev_group = { 
	.attrs = mdev_dev_attrs,

};



const struct attribute_group *mdev_dev_groups[] = {

static const struct attribute_group *mdev_dev_groups[] = {

	&mdev_dev_group,

	NULL,

};
@@ -1347,7 +1348,7 @@ name_show(struct kobject *kobj, struct device *dev, char *buf) 
	return -EINVAL;

}



MDEV_TYPE_ATTR_RO(name);

static MDEV_TYPE_ATTR_RO(name);



static ssize_t

available_instances_show(struct kobject *kobj, struct device *dev, char *buf)
@@ -1375,7 +1376,7 @@ available_instances_show(struct kobject *kobj, struct device *dev, char *buf) 
	return sprintf(buf, "%d\n", (MAX_MTTYS - used)/ports);

}



MDEV_TYPE_ATTR_RO(available_instances);

static MDEV_TYPE_ATTR_RO(available_instances);





static ssize_t device_api_show(struct kobject *kobj, struct device *dev,
@@ -1384,7 +1385,7 @@ static ssize_t device_api_show(struct kobject *kobj, struct device *dev, 
	return sprintf(buf, "%s\n", VFIO_DEVICE_API_PCI_STRING);

}



MDEV_TYPE_ATTR_RO(device_api);

static MDEV_TYPE_ATTR_RO(device_api);



static struct attribute *mdev_types_attrs[] = {

	&mdev_type_attr_name.attr,
@@ -1403,7 +1404,7 @@ static struct attribute_group mdev_type_group2 = { 
	.attrs = mdev_types_attrs,

};



struct attribute_group *mdev_type_groups[] = {

static struct attribute_group *mdev_type_groups[] = {

	&mdev_type_group1,

	&mdev_type_group2,

	NULL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE