Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ata: sata_fsl: fix sscanf() and sysfs_emit() format strings

Browse Source 
Use the %u format for unsigned int parameters handling with sscanf() and
sysfs_emit() to avoid compilation warnings. In
fsl_sata_rx_watermark_store(), the call to sscanf() to parse a single
argument is replaced with a call to kstrtouint().

While at it, also replace the printk(KERN_ERR) calls with dev_err()
calls and fix blank lines in fsl_sata_rx_watermark_store().

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
This commit is contained in:
Damien Le Moal 2022-02-08 15:16:09 +09:00
parent fda17afc61
commit 921d2eb096
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ata/sata_fsl.c
View File

@ -322,7 +322,7 @@ static void fsl_sata_set_irq_coalescing(struct ata_host *host,
static ssize_t fsl_sata_intr_coalescing_show(struct device *dev, static ssize_t fsl_sata_intr_coalescing_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sysfs_emit(buf, "%d %d\n", return sysfs_emit(buf, "%u %u\n",
intr_coalescing_count, intr_coalescing_ticks); intr_coalescing_count, intr_coalescing_ticks);
} }
@ -332,10 +332,8 @@ static ssize_t fsl_sata_intr_coalescing_store(struct device *dev,
{ {
unsigned int coalescing_count, coalescing_ticks; unsigned int coalescing_count, coalescing_ticks;
if (sscanf(buf, "%d%d", if (sscanf(buf, "%u%u", &coalescing_count, &coalescing_ticks) != 2) {
&coalescing_count, dev_err(dev, "fsl-sata: wrong parameter format.\n");
&coalescing_ticks) != 2) {
printk(KERN_ERR "fsl-sata: wrong parameter format.\n");
return -EINVAL; return -EINVAL;
} }
@ -359,7 +357,7 @@ static ssize_t fsl_sata_rx_watermark_show(struct device *dev,
rx_watermark &= 0x1f; rx_watermark &= 0x1f;
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
return sysfs_emit(buf, "%d\n", rx_watermark); return sysfs_emit(buf, "%u\n", rx_watermark);
} }
static ssize_t fsl_sata_rx_watermark_store(struct device *dev, static ssize_t fsl_sata_rx_watermark_store(struct device *dev,
@ -373,8 +371,8 @@ static ssize_t fsl_sata_rx_watermark_store(struct device *dev,
void __iomem *csr_base = host_priv->csr_base; void __iomem *csr_base = host_priv->csr_base;
u32 temp; u32 temp;
if (sscanf(buf, "%d", &rx_watermark) != 1) { if (kstrtouint(buf, 10, &rx_watermark) < 0) {
printk(KERN_ERR "fsl-sata: wrong parameter format.\n"); dev_err(dev, "fsl-sata: wrong parameter format.\n");
return -EINVAL; return -EINVAL;
} }
@ -382,8 +380,8 @@ static ssize_t fsl_sata_rx_watermark_store(struct device *dev,
temp = ioread32(csr_base + TRANSCFG); temp = ioread32(csr_base + TRANSCFG);
temp &= 0xffffffe0; temp &= 0xffffffe0;
iowrite32(temp | rx_watermark, csr_base + TRANSCFG); iowrite32(temp | rx_watermark, csr_base + TRANSCFG);
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
return strlen(buf); return strlen(buf);
} }