From cd88d2b11dc34b794e65d7aec64bd35086749945 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Tue, 21 May 2019 08:56:28 +0100 Subject: [PATCH] staging: kpc2000: added separate show functions for kpc_uio_class device attributes, defined them as read-only and declared them static. Defined separate simple show functions for each attribute instead of having a one big one containing a chain of conditionals. Replaced scnprintf calls with sprintf since all the outputs are short bounded strings or single integers. All of the device attributes are read-only, so used DEVICE_ATTR_RO to define them. The definitions are only used to populate the kpc_uio_class_attrs attribute array, so declared them as static. Fixes the following sparse warnings: drivers/staging/kpc2000/kpc2000/cell_probe.c:220:1: warning: symbol 'dev_attr_offset' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:221:1: warning: symbol 'dev_attr_size' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:222:1: warning: symbol 'dev_attr_type' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:223:1: warning: symbol 'dev_attr_s2c_dma' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:224:1: warning: symbol 'dev_attr_c2s_dma' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:225:1: warning: symbol 'dev_attr_irq_count' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:226:1: warning: symbol 'dev_attr_irq_base_num' was not declared. Should it be static? drivers/staging/kpc2000/kpc2000/cell_probe.c:227:1: warning: symbol 'dev_attr_core_num' was not declared. Should it be static? Signed-off-by: Jeremy Sowden Signed-off-by: Greg Kroah-Hartman --- drivers/staging/kpc2000/kpc2000/cell_probe.c | 135 ++++++++++++++++++--------- 1 file changed, 89 insertions(+), 46 deletions(-) diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c b/drivers/staging/kpc2000/kpc2000/cell_probe.c index 9289ac98c8c6..3796f034312a 100644 --- a/drivers/staging/kpc2000/kpc2000/cell_probe.c +++ b/drivers/staging/kpc2000/kpc2000/cell_probe.c @@ -145,55 +145,99 @@ struct kpc_uio_device { u16 core_num; }; -static ssize_t show_attr(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t offset_show(struct device *dev, struct device_attribute *attr, + char *buf) { - struct kpc_uio_device *kudev = dev_get_drvdata(dev); - - #define ATTR_NAME_CMP(v) (strcmp(v, attr->attr.name) == 0) - if ATTR_NAME_CMP("offset"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.offset); - } else if ATTR_NAME_CMP("size"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.length); - } else if ATTR_NAME_CMP("type"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.type); - } - else if ATTR_NAME_CMP("s2c_dma"){ - if (kudev->cte.s2c_dma_present){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.s2c_dma_channel_num); - } else { - return scnprintf(buf, PAGE_SIZE, "not present\n"); - } - } else if ATTR_NAME_CMP("c2s_dma"){ - if (kudev->cte.c2s_dma_present){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.c2s_dma_channel_num); - } else { - return scnprintf(buf, PAGE_SIZE, "not present\n"); - } - } - else if ATTR_NAME_CMP("irq_count"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.irq_count); - } else if ATTR_NAME_CMP("irq_base_num"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->cte.irq_base_num); - } else if ATTR_NAME_CMP("core_num"){ - return scnprintf(buf, PAGE_SIZE, "%u\n", kudev->core_num); - } else { - return 0; - } - #undef ATTR_NAME_CMP + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->cte.offset); +} +static DEVICE_ATTR_RO(offset); + +static ssize_t size_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->cte.length); } +static DEVICE_ATTR_RO(size); +static ssize_t type_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->cte.type); +} +static DEVICE_ATTR_RO(type); + +static ssize_t s2c_dma_ch_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return 0; +} +static DEVICE_ATTR_RO(s2c_dma_ch); + +static ssize_t c2s_dma_ch_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return 0; +} +static DEVICE_ATTR_RO(c2s_dma_ch); + +static ssize_t s2c_dma_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); -DEVICE_ATTR(offset, 0444, show_attr, NULL); -DEVICE_ATTR(size, 0444, show_attr, NULL); -DEVICE_ATTR(type, 0444, show_attr, NULL); -DEVICE_ATTR(s2c_dma_ch, 0444, show_attr, NULL); -DEVICE_ATTR(c2s_dma_ch, 0444, show_attr, NULL); -DEVICE_ATTR(s2c_dma, 0444, show_attr, NULL); -DEVICE_ATTR(c2s_dma, 0444, show_attr, NULL); -DEVICE_ATTR(irq_count, 0444, show_attr, NULL); -DEVICE_ATTR(irq_base_num, 0444, show_attr, NULL); -DEVICE_ATTR(core_num, 0444, show_attr, NULL); -struct attribute * kpc_uio_class_attrs[] = { + if (!kudev->cte.s2c_dma_present) + return sprintf(buf, "%s", "not present\n"); + + return sprintf(buf, "%u\n", kudev->cte.s2c_dma_channel_num); +} +static DEVICE_ATTR_RO(s2c_dma); + +static ssize_t c2s_dma_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + if (!kudev->cte.c2s_dma_present) + return sprintf(buf, "%s", "not present\n"); + + return sprintf(buf, "%u\n", kudev->cte.c2s_dma_channel_num); +} +static DEVICE_ATTR_RO(c2s_dma); + +static ssize_t irq_count_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->cte.irq_count); +} +static DEVICE_ATTR_RO(irq_count); + +static ssize_t irq_base_num_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->cte.irq_base_num); +} +static DEVICE_ATTR_RO(irq_base_num); + +static ssize_t core_num_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct kpc_uio_device *kudev = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", kudev->core_num); +} +static DEVICE_ATTR_RO(core_num); + +struct attribute *kpc_uio_class_attrs[] = { &dev_attr_offset.attr, &dev_attr_size.attr, &dev_attr_type.attr, @@ -207,7 +251,6 @@ struct attribute * kpc_uio_class_attrs[] = { NULL, }; - static int kp2000_check_uio_irq(struct kp2000_device *pcard, u32 irq_num) { -- 2.11.0