staging: gasket: core: Fix a coding style issue in gasket_core.c
PATCH 1/1 staging: gasket: core: Fix a coding style issue in gasket_core.c
Fix a coding alignment issue found by checkpatch.pl.
Signed-off-by Zhixu Zhao <[email protected]>
--- drivers/staging/gasket/gasket_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gasket/gasket_core.c +1 -1
@@ -304,7 +304,7 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num) gasket_dev->bar_data[bar_num].virt_base =ioremap (gasket_dev->bar_data[bar_num].phys_base, - gasket_dev->bar_data[bar_num].length_bytes); + gasket_dev->bar_data[bar_num].length_bytes);if (!gasket_dev->bar_data[bar_num].virt_base) { dev_err(gasket_dev->dev, "Cannot remap BAR %d memory region %p\n",
Signature · 1 line
2.17.1
Quoted 1 line · Zhixu Zhao
Fix a coding alignment issue found by checkpatch.pl.
Another option would be to use a temporary for
gasket_dev->bar_data[bar_num]
Something like:
--- drivers/staging/gasket/gasket_core.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/staging/gasket/gasket_core.c +14 -15
@@ -262,6 +262,7 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num) internal_desc->driver_desc;ulong desc_bytes = driver_desc->bar_descriptions[bar_num].size;int ret; +struct gasket_bar_data *data;if (desc_bytes ==0 )return 0 ;
@@ -270,31 +271,32 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num)/* not PCI: skip this entry */ return 0 ; } + + data = &gasket_dev->bar_data[bar_num]; +/* * pci_resource_start and pci_resource_len return a "resource_size_t", * which is safely castable to ulong (which itself is the arg to * request_mem_region). */ - gasket_dev->bar_data[bar_num].phys_base = + data->phys_base = (ulong )pci_resource_start (gasket_dev->pci_dev, bar_num); -if (!gasket_dev->bar_data[bar_num].phys_base) { +if (!data->phys_base) {dev_err (gasket_dev->dev,"Cannot get BAR%u base address\n" , bar_num);return -EINVAL ; } - gasket_dev->bar_data[bar_num].length_bytes = + data->length_bytes = (ulong )pci_resource_len (gasket_dev->pci_dev, bar_num); -if (gasket_dev->bar_data[bar_num].length_bytes < desc_bytes) { +if (data->length_bytes < desc_bytes) {dev_err (gasket_dev->dev,"PCI BAR %u space is too small: %lu; expected >= %lu\n" , - bar_num, gasket_dev->bar_data[bar_num].length_bytes, - desc_bytes); + bar_num, data->length_bytes, desc_bytes);return -ENOMEM ; } -if (!request_mem_region (gasket_dev->bar_data[bar_num].phys_base, - gasket_dev->bar_data[bar_num].length_bytes, +if (!request_mem_region (data->phys_base, data->length_bytes, gasket_dev->dev_info.name)) { dev_err(gasket_dev->dev, "Cannot get BAR %d memory region %p\n",
@@ -302,10 +304,8 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num)return -EINVAL ; } - gasket_dev->bar_data[bar_num].virt_base = -ioremap (gasket_dev->bar_data[bar_num].phys_base, - gasket_dev->bar_data[bar_num].length_bytes); -if (!gasket_dev->bar_data[bar_num].virt_base) { + data->virt_base =ioremap (data->phys_base, data->length_bytes); +if (!data->virt_base) {dev_err (gasket_dev->dev,"Cannot remap BAR %d memory region %p\n" , bar_num, &gasket_dev->pci_dev->resource[bar_num]);
@@ -319,9 +319,8 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num)return 0 ; fail: -iounmap (gasket_dev->bar_data[bar_num].virt_base); -release_mem_region (gasket_dev->bar_data[bar_num].phys_base, - gasket_dev->bar_data[bar_num].length_bytes); +iounmap (data->virt_base); +release_mem_region (data->phys_base, data->length_bytes);return ret; }