Commit abc36be2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs 

Pull configfs updates from Christoph Hellwig:
 "A couple of configfs cleanups:

   - proper use of the bool type (Thomas Meyer)

   - constification of struct config_item_type (Bhumika Goyal)"

* tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs:
  RDMA/cma: make config_item_type const
  stm class: make config_item_type const
  ACPI: configfs: make config_item_type const
  nvmet: make config_item_type const
  usb: gadget: configfs: make config_item_type const
  PCI: endpoint: make config_item_type const
  iio: make function argument and some structures const
  usb: gadget: make config_item_type structures const
  dlm: make config_item_type const
  netconsole: make config_item_type const
  nullb: make config_item_type const
  ocfs2/cluster: make config_item_type const
  target: make config_item_type const
  configfs: make ci_type field, some pointers and function arguments const
  configfs: make config_item_type const
  configfs: Fix bool initialization/comparison
parents f14fc0cc 6ace4f6b

drivers/acpi/acpi_configfs.c

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct configfs_attribute *acpi_table_attrs[] = { 
	NULL,

};



static struct config_item_type acpi_table_type = {

static const struct config_item_type acpi_table_type = {

	.ct_owner = THIS_MODULE,

	.ct_bin_attrs = acpi_table_bin_attrs,

	.ct_attrs = acpi_table_attrs,
@@ -237,12 +237,12 @@ struct configfs_group_operations acpi_table_group_ops = { 
	.drop_item = acpi_table_drop_item,

};



static struct config_item_type acpi_tables_type = {

static const struct config_item_type acpi_tables_type = {

	.ct_owner = THIS_MODULE,

	.ct_group_ops = &acpi_table_group_ops,

};



static struct config_item_type acpi_root_group_type = {

static const struct config_item_type acpi_root_group_type = {

	.ct_owner = THIS_MODULE,

};

drivers/block/null_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static struct configfs_item_operations nullb_device_ops = { 
	.release	= nullb_device_release,

};



static struct config_item_type nullb_device_type = {

static const struct config_item_type nullb_device_type = {

	.ct_item_ops	= &nullb_device_ops,

	.ct_attrs	= nullb_device_attrs,

	.ct_owner	= THIS_MODULE,
@@ -528,7 +528,7 @@ static struct configfs_group_operations nullb_group_ops = { 
	.drop_item	= nullb_group_drop_item,

};



static struct config_item_type nullb_group_type = {

static const struct config_item_type nullb_group_type = {

	.ct_group_ops	= &nullb_group_ops,

	.ct_attrs	= nullb_group_attrs,

	.ct_owner	= THIS_MODULE,

drivers/hwtracing/stm/policy.c

+5 −5
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ static struct configfs_attribute *stp_policy_node_attrs[] = { 
	NULL,

};



static struct config_item_type stp_policy_type;

static struct config_item_type stp_policy_node_type;

static const struct config_item_type stp_policy_type;

static const struct config_item_type stp_policy_node_type;



static struct config_group *

stp_policy_node_make(struct config_group *group, const char *name)
@@ -236,7 +236,7 @@ static struct configfs_group_operations stp_policy_node_group_ops = { 
	.drop_item	= stp_policy_node_drop,

};



static struct config_item_type stp_policy_node_type = {

static const struct config_item_type stp_policy_node_type = {

	.ct_item_ops	= &stp_policy_node_item_ops,

	.ct_group_ops	= &stp_policy_node_group_ops,

	.ct_attrs	= stp_policy_node_attrs,
@@ -311,7 +311,7 @@ static struct configfs_group_operations stp_policy_group_ops = { 
	.make_group	= stp_policy_node_make,

};



static struct config_item_type stp_policy_type = {

static const struct config_item_type stp_policy_type = {

	.ct_item_ops	= &stp_policy_item_ops,

	.ct_group_ops	= &stp_policy_group_ops,

	.ct_attrs	= stp_policy_attrs,
@@ -380,7 +380,7 @@ static struct configfs_group_operations stp_policies_group_ops = { 
	.make_group	= stp_policies_make,

};



static struct config_item_type stp_policies_type = {

static const struct config_item_type stp_policies_type = {

	.ct_group_ops	= &stp_policies_group_ops,

	.ct_owner	= THIS_MODULE,

};

drivers/iio/dummy/iio_simple_dummy.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/iio/sw_device.h>

#include "iio_simple_dummy.h"



static struct config_item_type iio_dummy_type = {

static const struct config_item_type iio_dummy_type = {

	.ct_owner = THIS_MODULE,

};

drivers/iio/industrialio-configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/iio/iio.h>

#include <linux/iio/configfs.h>



static struct config_item_type iio_root_group_type = {

static const struct config_item_type iio_root_group_type = {

	.ct_owner       = THIS_MODULE,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE