[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] hw/misc/:split some lines containing more than 80 characte
From: |
Gan Qixin |
Subject: |
[PATCH 05/10] hw/misc/:split some lines containing more than 80 characters |
Date: |
Tue, 20 Oct 2020 04:30:18 +0800 |
By using scripts/checkpatch.pl, it is found that many files in hw/misc/
contain lines with more than 80 characters.
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
hw/misc/aspeed_sdmc.c | 10 ++++++----
hw/misc/bcm2835_mphi.c | 3 ++-
hw/misc/edu.c | 3 ++-
hw/misc/omap_gpmc.c | 3 ++-
hw/misc/omap_sdrc.c | 3 ++-
hw/misc/pci-testdev.c | 3 ++-
hw/misc/sifive_test.c | 4 ++--
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index 08f856cbda..2d9f6b5892 100644
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -310,7 +310,8 @@ static void aspeed_2400_sdmc_write(AspeedSDMCState *s,
uint32_t reg,
uint32_t data)
{
if (reg == R_PROT) {
- s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED :
PROT_SOFTLOCKED;
+ s->regs[reg] = (data ==
+ PROT_KEY_UNLOCK) ? PROT_UNLOCKED : PROT_SOFTLOCKED;
return;
}
@@ -368,7 +369,8 @@ static void aspeed_2500_sdmc_write(AspeedSDMCState *s,
uint32_t reg,
uint32_t data)
{
if (reg == R_PROT) {
- s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED :
PROT_SOFTLOCKED;
+ s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED :
+ PROT_SOFTLOCKED;
return;
}
@@ -448,8 +450,8 @@ static void aspeed_2600_sdmc_write(AspeedSDMCState *s,
uint32_t reg,
}
if (s->regs[R_PROT] == PROT_HARDLOCKED) {
- qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked until system
reset!\n",
- __func__);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: SDMC is locked until system reset!\n", __func__);
return;
}
diff --git a/hw/misc/bcm2835_mphi.c b/hw/misc/bcm2835_mphi.c
index 0428e10ba5..4c417770e4 100644
--- a/hw/misc/bcm2835_mphi.c
+++ b/hw/misc/bcm2835_mphi.c
@@ -148,7 +148,8 @@ static void mphi_init(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
BCM2835MphiState *s = BCM2835_MPHI(obj);
- memory_region_init_io(&s->iomem, obj, &mphi_mmio_ops, s, "mphi",
MPHI_MMIO_SIZE);
+ memory_region_init_io(&s->iomem, obj, &mphi_mmio_ops, s,
+ "mphi", MPHI_MMIO_SIZE);
sysbus_init_mmio(sbd, &s->iomem);
}
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index e935c418d4..5c933d1261 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -129,7 +129,8 @@ static dma_addr_t edu_clamp_addr(const EduState *edu,
dma_addr_t addr)
dma_addr_t res = addr & edu->dma_mask;
if (addr != res) {
- printf("EDU: clamping DMA %#.16"PRIx64" to %#.16"PRIx64"!\n", addr,
res);
+ printf("EDU: clamping DMA 0x%.16"PRIx64" to 0x%.16"PRIx64"!\n",
+ addr, res);
}
return res;
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 10de7a5523..e721fdde1f 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -830,7 +830,8 @@ struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s
*mpu,
int cs;
struct omap_gpmc_s *s = g_new0(struct omap_gpmc_s, 1);
- memory_region_init_io(&s->iomem, NULL, &omap_gpmc_ops, s, "omap-gpmc",
0x1000);
+ memory_region_init_io(&s->iomem, NULL, &omap_gpmc_ops, s,
+ "omap-gpmc", 0x1000);
memory_region_add_subregion(get_system_memory(), base, &s->iomem);
s->irq = irq;
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index f2f72f6810..438e9ce2ba 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -161,7 +161,8 @@ struct omap_sdrc_s *omap_sdrc_init(MemoryRegion *sysmem,
omap_sdrc_reset(s);
- memory_region_init_io(&s->iomem, NULL, &omap_sdrc_ops, s, "omap.sdrc",
0x1000);
+ memory_region_init_io(&s->iomem, NULL, &omap_sdrc_ops,
+ s, "omap.sdrc", 0x1000);
memory_region_add_subregion(sysmem, base, &s->iomem);
return s;
diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 03845c8de3..ac21f918a2 100644
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -277,7 +277,8 @@ static void pci_testdev_realize(PCIDevice *pci_dev, Error
**errp)
test->hdr = g_malloc0(test->bufsize);
memcpy(test->hdr->name, name, strlen(name) + 1);
g_free(name);
- test->hdr->offset = cpu_to_le32(IOTEST_SIZE(i) + i *
IOTEST_ACCESS_WIDTH);
+ test->hdr->offset = cpu_to_le32(IOTEST_SIZE(i) +
+ i * IOTEST_ACCESS_WIDTH);
test->match_data = strcmp(IOTEST_TEST(i), "wildcard-eventfd");
if (fastmmio && IOTEST_IS_MEM(i) && !test->match_data) {
test->size = 0;
diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c
index 2deb2072cc..2ffcb3b532 100644
--- a/hw/misc/sifive_test.c
+++ b/hw/misc/sifive_test.c
@@ -50,8 +50,8 @@ static void sifive_test_write(void *opaque, hwaddr addr,
break;
}
}
- qemu_log_mask(LOG_GUEST_ERROR, "%s: write: addr=0x%x val=0x%016" PRIx64
"\n",
- __func__, (int)addr, val64);
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: write: addr=0x%x val=0x%016" PRIx64
+ "\n", __func__, (int)addr, val64);
}
static const MemoryRegionOps sifive_test_ops = {
--
2.23.0
- [PATCH 00/10] Fix line over 80 characters warning, Gan Qixin, 2020/10/20
- Re: [PATCH 00/10] Fix line over 80 characters warning, Daniel P . Berrangé, 2020/10/20
- Re: [PATCH 00/10] Fix line over 80 characters warning, Peter Maydell, 2020/10/20
- [PATCH 03/10] hw/ide/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 06/10] hw/pci/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 09/10] hw/input/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 04/10] hw/intc/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 05/10] hw/misc/:split some lines containing more than 80 characters,
Gan Qixin <=
- [PATCH 01/10] hw/virtio/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 07/10] hw/pci-host/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 02/10] hw/core/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 08/10] hw/char/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20
- [PATCH 10/10] hw/riscv/:split some lines containing more than 80 characters, Gan Qixin, 2020/10/20