diff options
Diffstat (limited to 'drivers/staging/gasket')
-rw-r--r-- | drivers/staging/gasket/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/gasket/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/gasket/apex_driver.c | 8 | ||||
-rw-r--r-- | drivers/staging/gasket/gasket_interrupt.c | 6 | ||||
-rw-r--r-- | drivers/staging/gasket/gasket_page_table.c | 5 | ||||
-rw-r--r-- | drivers/staging/gasket/gasket_sysfs.c | 9 | ||||
-rw-r--r-- | drivers/staging/gasket/gasket_sysfs.h | 4 |
7 files changed, 14 insertions, 20 deletions
diff --git a/drivers/staging/gasket/Kconfig b/drivers/staging/gasket/Kconfig index e82b85541f7e..d9bef8ca41ef 100644 --- a/drivers/staging/gasket/Kconfig +++ b/drivers/staging/gasket/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menu "Gasket devices" config STAGING_GASKET_FRAMEWORK diff --git a/drivers/staging/gasket/Makefile b/drivers/staging/gasket/Makefile index cec813ece678..ce03e256f501 100644 --- a/drivers/staging/gasket/Makefile +++ b/drivers/staging/gasket/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for Gasket framework and dependent drivers. # diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c index 0578bf1ba1e9..2be45ee9d061 100644 --- a/drivers/staging/gasket/apex_driver.c +++ b/drivers/staging/gasket/apex_driver.c @@ -294,7 +294,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev) /* - Wait for RAM shutdown. */ if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX, - APEX_BAR2_REG_SCU_3, 1 << 6, 1 << 6, + APEX_BAR2_REG_SCU_3, BIT(6), BIT(6), APEX_RESET_DELAY, APEX_RESET_RETRY)) { dev_err(gasket_dev->dev, "RAM did not shut down within timeout (%d ms)\n", @@ -340,7 +340,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev) /* - Wait for RAM enable. */ if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX, - APEX_BAR2_REG_SCU_3, 1 << 6, 0, + APEX_BAR2_REG_SCU_3, BIT(6), 0, APEX_RESET_DELAY, APEX_RESET_RETRY)) { dev_err(gasket_dev->dev, "RAM did not enable within timeout (%d ms)\n", @@ -439,9 +439,7 @@ static int apex_reset(struct gasket_dev *gasket_dev) if (ret) return ret; } - ret = apex_quit_reset(gasket_dev); - - return ret; + return apex_quit_reset(gasket_dev); } /* diff --git a/drivers/staging/gasket/gasket_interrupt.c b/drivers/staging/gasket/gasket_interrupt.c index ff61b782df30..2d6195f7300e 100644 --- a/drivers/staging/gasket/gasket_interrupt.c +++ b/drivers/staging/gasket/gasket_interrupt.c @@ -97,8 +97,7 @@ static void gasket_interrupt_setup(struct gasket_dev *gasket_dev) * modify-write and shift based on the packing index. */ dev_dbg(gasket_dev->dev, - "Setting up interrupt index %d with index 0x%llx and " - "packing %d\n", + "Setting up interrupt index %d with index 0x%llx and packing %d\n", interrupt_data->interrupts[i].index, interrupt_data->interrupts[i].reg, interrupt_data->interrupts[i].packing); @@ -120,8 +119,7 @@ static void gasket_interrupt_setup(struct gasket_dev *gasket_dev) break; default: dev_dbg(gasket_dev->dev, - "Found interrupt description with " - "unknown enum %d\n", + "Found interrupt description with unknown enum %d\n", interrupt_data->interrupts[i].packing); return; } diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c index 26755d9ca41d..600928f63577 100644 --- a/drivers/staging/gasket/gasket_page_table.c +++ b/drivers/staging/gasket/gasket_page_table.c @@ -768,8 +768,7 @@ static bool gasket_is_extended_dev_addr_bad(struct gasket_page_table *pg_tbl, page_lvl0_idx = gasket_extended_lvl0_page_idx(pg_tbl, dev_addr); /* Get the count of affected level 0 pages. */ - num_lvl0_pages = (num_pages + GASKET_PAGES_PER_SUBTABLE - 1) / - GASKET_PAGES_PER_SUBTABLE; + num_lvl0_pages = DIV_ROUND_UP(num_pages, GASKET_PAGES_PER_SUBTABLE); if (gasket_components_to_dev_address(pg_tbl, 0, page_global_idx, page_offset) != dev_addr) { @@ -1258,7 +1257,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size, dma_addr_t handle; void *mem; int j; - unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE; + unsigned int num_pages = DIV_ROUND_UP(size, PAGE_SIZE); const struct gasket_driver_desc *driver_desc = gasket_get_driver_desc(gasket_dev); diff --git a/drivers/staging/gasket/gasket_sysfs.c b/drivers/staging/gasket/gasket_sysfs.c index fc45f0d13e87..a2d67c28f530 100644 --- a/drivers/staging/gasket/gasket_sysfs.c +++ b/drivers/staging/gasket/gasket_sysfs.c @@ -223,8 +223,7 @@ int gasket_sysfs_create_entries(struct device *device, if (!mapping) { dev_dbg(device, - "Creating entries for device without first " - "initializing mapping\n"); + "Creating entries for device without first initializing mapping\n"); return -EINVAL; } @@ -233,8 +232,7 @@ int gasket_sysfs_create_entries(struct device *device, i++) { if (mapping->attribute_count == GASKET_SYSFS_MAX_NODES) { dev_err(device, - "Maximum number of sysfs nodes reached for " - "device\n"); + "Maximum number of sysfs nodes reached for device\n"); mutex_unlock(&mapping->mutex); put_mapping(mapping); return -ENOMEM; @@ -264,8 +262,7 @@ void gasket_sysfs_remove_mapping(struct device *device) if (!mapping) { dev_err(device, - "Attempted to remove non-existent sysfs mapping to " - "device\n"); + "Attempted to remove non-existent sysfs mapping to device\n"); return; } diff --git a/drivers/staging/gasket/gasket_sysfs.h b/drivers/staging/gasket/gasket_sysfs.h index 151e8edd28ea..1d0eed66a7f4 100644 --- a/drivers/staging/gasket/gasket_sysfs.h +++ b/drivers/staging/gasket/gasket_sysfs.h @@ -40,8 +40,8 @@ */ #define GASKET_END_OF_ATTR_ARRAY \ { \ - .attr = __ATTR(GASKET_ARRAY_END_TOKEN, S_IRUGO, NULL, NULL), \ - .data.attr_type = 0, \ + .attr = __ATTR_NULL, \ + .data.attr_type = 0, \ } /* |