Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad6344a authored by Jan Beulich's avatar Jan Beulich Committed by David Vrabel
Browse files

xen-pciback: drop superfluous variables 



req_start is simply an alias of the "offset" function parameter, and
req_end is being used just once in each function. (And both variables
were loop invariant anyway, so should at least have got initialized
outside the loop.)

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent ee87d6d0

drivers/xen/xen-pciback/conf_space.c

+6 −10
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size, 
	struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev);

	const struct config_field_entry *cfg_entry;

	const struct config_field *field;

	int req_start, req_end, field_start, field_end;

	int field_start, field_end;

	/* if read fails for any reason, return 0

	 * (as if device didn't respond) */

	u32 value = 0, tmp_val;
@@ -178,12 +178,10 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size, 
	list_for_each_entry(cfg_entry, &dev_data->config_fields, list) {

		field = cfg_entry->field;



		req_start = offset;

		req_end = offset + size;

		field_start = OFFSET(cfg_entry);

		field_end = OFFSET(cfg_entry) + field->size;



		 if (req_end > field_start && field_end > req_start) {

		if (offset + size > field_start && field_end > offset) {

			err = conf_space_read(dev, cfg_entry, field_start,

					      &tmp_val);

			if (err)
@@ -191,7 +189,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size, 


			value = merge_value(value, tmp_val,

					    get_mask(field->size),

					    field_start - req_start);

					    field_start - offset);

		}

	}
@@ -211,7 +209,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value) 
	const struct config_field_entry *cfg_entry;

	const struct config_field *field;

	u32 tmp_val;

	int req_start, req_end, field_start, field_end;

	int field_start, field_end;



	if (unlikely(verbose_request))

		printk(KERN_DEBUG
@@ -224,19 +222,17 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value) 
	list_for_each_entry(cfg_entry, &dev_data->config_fields, list) {

		field = cfg_entry->field;



		req_start = offset;

		req_end = offset + size;

		field_start = OFFSET(cfg_entry);

		field_end = OFFSET(cfg_entry) + field->size;



		 if (req_end > field_start && field_end > req_start) {

		if (offset + size > field_start && field_end > offset) {

			err = conf_space_read(dev, cfg_entry, field_start,

					      &tmp_val);

			if (err)

				break;



			tmp_val = merge_value(tmp_val, value, get_mask(size),

					      req_start - field_start);

					      offset - field_start);



			err = conf_space_write(dev, cfg_entry, field_start,

					       tmp_val);