Merge branch 'constify' into release (e2fae0ab) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/acpi/battery.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
		static struct battery_file {
		struct file_operations ops;
		mode_t mode;
		char *name;
		const char *name;
		} acpi_battery_file[] = {
		FILE_DESCRIPTION_RO(info),
		FILE_DESCRIPTION_RO(state),

drivers/acpi/ec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -682,7 +682,7 @@ static int acpi_ec_info_open_fs(struct inode inode, struct file file)
		return single_open(file, acpi_ec_read_info, PDE(inode)->data);
		}

		static struct file_operations acpi_ec_info_ops = {
		static const struct file_operations acpi_ec_info_ops = {
		.open = acpi_ec_info_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,

drivers/acpi/processor_thermal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -509,7 +509,7 @@ static ssize_t acpi_processor_write_limit(struct file * file,
		return count;
		}

		struct file_operations acpi_processor_limit_fops = {
		const struct file_operations acpi_processor_limit_fops = {
		.owner = THIS_MODULE,
		.open = acpi_processor_limit_open_fs,
		.read = seq_read,

drivers/acpi/processor_throttling.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1291,7 +1291,7 @@ static ssize_t acpi_processor_write_throttling(struct file *file,
		return count;
		}

		struct file_operations acpi_processor_throttling_fops = {
		const struct file_operations acpi_processor_throttling_fops = {
		.owner = THIS_MODULE,
		.open = acpi_processor_throttling_open_fs,
		.read = seq_read,

drivers/acpi/sbs.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -484,9 +484,9 @@ static int
		acpi_sbs_add_fs(struct proc_dir_entry **dir,
		struct proc_dir_entry *parent_dir,
		char *dir_name,
		struct file_operations *info_fops,
		struct file_operations *state_fops,
		struct file_operations alarm_fops, void data)
		const struct file_operations *info_fops,
		const struct file_operations *state_fops,
		const struct file_operations alarm_fops, void data)
		{
		if (!*dir) {
		*dir = proc_mkdir(dir_name, parent_dir);
		@@ -682,7 +682,7 @@ static int acpi_battery_alarm_open_fs(struct inode inode, struct file file)
		return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
		}

		static struct file_operations acpi_battery_info_fops = {
		static const struct file_operations acpi_battery_info_fops = {
		.open = acpi_battery_info_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,
		@@ -690,7 +690,7 @@ static struct file_operations acpi_battery_info_fops = {
		.owner = THIS_MODULE,
		};

		static struct file_operations acpi_battery_state_fops = {
		static const struct file_operations acpi_battery_state_fops = {
		.open = acpi_battery_state_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,
		@@ -698,7 +698,7 @@ static struct file_operations acpi_battery_state_fops = {
		.owner = THIS_MODULE,
		};

		static struct file_operations acpi_battery_alarm_fops = {
		static const struct file_operations acpi_battery_alarm_fops = {
		.open = acpi_battery_alarm_open_fs,
		.read = seq_read,
		.write = acpi_battery_write_alarm,
		@@ -730,7 +730,7 @@ static int acpi_ac_state_open_fs(struct inode inode, struct file file)
		return single_open(file, acpi_ac_read_state, PDE(inode)->data);
		}

		static struct file_operations acpi_ac_state_fops = {
		static const struct file_operations acpi_ac_state_fops = {
		.open = acpi_ac_state_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,