Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1437500

[PATCH v4 7/7] xen-pciback: drop superfluous variables

Show all headers | View raw

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: Jan Beulich <jbeulich@suse.com>
---
 drivers/xen/xen-pciback/conf_space.c |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

--- 4.7-rc6-xen-pciback.orig/drivers/xen/xen-pciback/conf_space.c
+++ 4.7-rc6-xen-pciback/drivers/xen/xen-pciback/conf_space.c
@@ -148,7 +148,7 @@ int xen_pcibk_config_read(struct pci_dev
 	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
 	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
 
 			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_de
 	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_de
 	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);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/7] xen-pciback: misc cleanup "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 08:50 +0200
  [PATCH v4 2/7] xen-pciback: drop rom_init() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 3/7] xen-pciback: fold read_dev_bar() into its now  single caller "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 1/7] xen-pciback: drop unused function parameter of  read_dev_bar() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 4/7] xen-pciback: simplify determination of 64-bit  memory resource "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 6/7] xen-pciback: short-circuit read path used for  merging write values "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 5/7] xen-pciback: use const and unsigned in  bar_init() "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:00 +0200
  [PATCH v4 7/7] xen-pciback: drop superfluous variables "Jan Beulich" <JBeulich@suse.com> - 2016-07-06 09:10 +0200
  Re: [Xen-devel] [PATCH v4 0/7] xen-pciback: misc cleanup David Vrabel <david.vrabel@citrix.com> - 2016-07-06 11:50 +0200

csiph-web