forked from Minki/linux
staging: kpc2000: rearrange lines exceeding 100 columns
Reformat lines that exceed 100 column in length. Issue reported by checkpatch script. Signed-off-by: Deepak R Varma <mh12gx2825@gmail.com> Link: https://lore.kernel.org/r/809d142d109b4f0acfcb4fa204bdd03381fc051f.1603295575.git.mh12gx2825@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Deepak R Varma
Greg Kroah-Hartman
parent
2ed1fa08e6
commit
ae94bd5374
@ -30,9 +30,12 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define KPC_OLD_DMA_CH_NUM(present, channel) ((present) ? (0x8 | ((channel) & 0x7)) : 0)
|
||||
#define KPC_OLD_S2C_DMA_CH_NUM(cte) KPC_OLD_DMA_CH_NUM(cte.s2c_dma_present, cte.s2c_dma_channel_num)
|
||||
#define KPC_OLD_C2S_DMA_CH_NUM(cte) KPC_OLD_DMA_CH_NUM(cte.c2s_dma_present, cte.c2s_dma_channel_num)
|
||||
#define KPC_OLD_DMA_CH_NUM(present, channel) \
|
||||
((present) ? (0x8 | ((channel) & 0x7)) : 0)
|
||||
#define KPC_OLD_S2C_DMA_CH_NUM(cte) \
|
||||
KPC_OLD_DMA_CH_NUM(cte.s2c_dma_present, cte.s2c_dma_channel_num)
|
||||
#define KPC_OLD_C2S_DMA_CH_NUM(cte) \
|
||||
KPC_OLD_DMA_CH_NUM(cte.c2s_dma_present, cte.c2s_dma_channel_num)
|
||||
|
||||
#define KP_CORE_ID_INVALID 0
|
||||
#define KP_CORE_ID_I2C 3
|
||||
@ -67,7 +70,8 @@ void parse_core_table_entry_v0(struct core_table_entry *cte, const u64 read_val
|
||||
static
|
||||
void dbg_cte(struct kp2000_device *pcard, struct core_table_entry *cte)
|
||||
{
|
||||
dev_dbg(&pcard->pdev->dev, "CTE: type:%3d offset:%3d (%3d) length:%3d (%3d) s2c:%d c2s:%d irq_count:%d base_irq:%d\n",
|
||||
dev_dbg(&pcard->pdev->dev,
|
||||
"CTE: type:%3d offset:%3d (%3d) length:%3d (%3d) s2c:%d c2s:%d irq_count:%d base_irq:%d\n",
|
||||
cte->type,
|
||||
cte->offset,
|
||||
cte->offset / 4096,
|
||||
@ -107,7 +111,14 @@ static int probe_core_basic(unsigned int core_num, struct kp2000_device *pcard,
|
||||
.ddna = pcard->ddna,
|
||||
};
|
||||
|
||||
dev_dbg(&pcard->pdev->dev, "Found Basic core: type = %02d dma = %02x / %02x offset = 0x%x length = 0x%x (%d regs)\n", cte.type, KPC_OLD_S2C_DMA_CH_NUM(cte), KPC_OLD_C2S_DMA_CH_NUM(cte), cte.offset, cte.length, cte.length / 8);
|
||||
dev_dbg(&pcard->pdev->dev,
|
||||
"Found Basic core: type = %02d dma = %02x / %02x offset = 0x%x length = 0x%x (%d regs)\n",
|
||||
cte.type,
|
||||
KPC_OLD_S2C_DMA_CH_NUM(cte),
|
||||
KPC_OLD_C2S_DMA_CH_NUM(cte),
|
||||
cte.offset,
|
||||
cte.length,
|
||||
cte.length / 8);
|
||||
|
||||
cell.platform_data = &core_pdata;
|
||||
cell.pdata_size = sizeof(struct kpc_core_device_platdata);
|
||||
@ -290,7 +301,14 @@ static int probe_core_uio(unsigned int core_num, struct kp2000_device *pcard,
|
||||
struct kpc_uio_device *kudev;
|
||||
int rv;
|
||||
|
||||
dev_dbg(&pcard->pdev->dev, "Found UIO core: type = %02d dma = %02x / %02x offset = 0x%x length = 0x%x (%d regs)\n", cte.type, KPC_OLD_S2C_DMA_CH_NUM(cte), KPC_OLD_C2S_DMA_CH_NUM(cte), cte.offset, cte.length, cte.length / 8);
|
||||
dev_dbg(&pcard->pdev->dev,
|
||||
"Found UIO core: type = %02d dma = %02x / %02x offset = 0x%x length = 0x%x (%d regs)\n",
|
||||
cte.type,
|
||||
KPC_OLD_S2C_DMA_CH_NUM(cte),
|
||||
KPC_OLD_C2S_DMA_CH_NUM(cte),
|
||||
cte.offset,
|
||||
cte.length,
|
||||
cte.length / 8);
|
||||
|
||||
kudev = kzalloc(sizeof(*kudev), GFP_KERNEL);
|
||||
if (!kudev)
|
||||
@ -315,10 +333,14 @@ static int probe_core_uio(unsigned int core_num, struct kp2000_device *pcard,
|
||||
|
||||
kudev->uioinfo.mem[0].name = "uiomap";
|
||||
kudev->uioinfo.mem[0].addr = pci_resource_start(pcard->pdev, REG_BAR) + cte.offset;
|
||||
kudev->uioinfo.mem[0].size = (cte.length + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1); // Round up to nearest PAGE_SIZE boundary
|
||||
|
||||
// Round up to nearest PAGE_SIZE boundary
|
||||
kudev->uioinfo.mem[0].size = (cte.length + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
|
||||
kudev->uioinfo.mem[0].memtype = UIO_MEM_PHYS;
|
||||
|
||||
kudev->dev = device_create(kpc_uio_class, &pcard->pdev->dev, MKDEV(0, 0), kudev, "%s.%d.%d.%d", kudev->uioinfo.name, pcard->card_num, cte.type, kudev->core_num);
|
||||
kudev->dev = device_create(kpc_uio_class,
|
||||
&pcard->pdev->dev, MKDEV(0, 0), kudev, "%s.%d.%d.%d",
|
||||
kudev->uioinfo.name, pcard->card_num, cte.type, kudev->core_num);
|
||||
if (IS_ERR(kudev->dev)) {
|
||||
dev_err(&pcard->pdev->dev, "%s: device_create failed!\n",
|
||||
__func__);
|
||||
@ -341,7 +363,9 @@ static int probe_core_uio(unsigned int core_num, struct kp2000_device *pcard,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int create_dma_engine_core(struct kp2000_device *pcard, size_t engine_regs_offset, int engine_num, int irq_num)
|
||||
static int create_dma_engine_core(struct kp2000_device *pcard,
|
||||
size_t engine_regs_offset,
|
||||
int engine_num, int irq_num)
|
||||
{
|
||||
struct mfd_cell cell = { .id = engine_num };
|
||||
struct resource resources[2];
|
||||
@ -380,18 +404,28 @@ static int kp2000_setup_dma_controller(struct kp2000_device *pcard)
|
||||
|
||||
// S2C Engines
|
||||
for (i = 0 ; i < 32 ; i++) {
|
||||
capabilities_reg = readq(pcard->dma_bar_base + KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i));
|
||||
capabilities_reg = readq(pcard->dma_bar_base +
|
||||
KPC_DMA_S2C_BASE_OFFSET +
|
||||
(KPC_DMA_ENGINE_SIZE * i));
|
||||
|
||||
if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) {
|
||||
err = create_dma_engine_core(pcard, (KPC_DMA_S2C_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), i, pcard->pdev->irq);
|
||||
err = create_dma_engine_core(pcard, (KPC_DMA_S2C_BASE_OFFSET +
|
||||
(KPC_DMA_ENGINE_SIZE * i)),
|
||||
i, pcard->pdev->irq);
|
||||
if (err)
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
// C2S Engines
|
||||
for (i = 0 ; i < 32 ; i++) {
|
||||
capabilities_reg = readq(pcard->dma_bar_base + KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i));
|
||||
capabilities_reg = readq(pcard->dma_bar_base +
|
||||
KPC_DMA_C2S_BASE_OFFSET +
|
||||
(KPC_DMA_ENGINE_SIZE * i));
|
||||
|
||||
if (capabilities_reg & ENGINE_CAP_PRESENT_MASK) {
|
||||
err = create_dma_engine_core(pcard, (KPC_DMA_C2S_BASE_OFFSET + (KPC_DMA_ENGINE_SIZE * i)), 32 + i, pcard->pdev->irq);
|
||||
err = create_dma_engine_core(pcard, (KPC_DMA_C2S_BASE_OFFSET +
|
||||
(KPC_DMA_ENGINE_SIZE * i)),
|
||||
32 + i, pcard->pdev->irq);
|
||||
if (err)
|
||||
goto err_out;
|
||||
}
|
||||
@ -433,10 +467,15 @@ int kp2000_probe_cores(struct kp2000_device *pcard)
|
||||
// Then, iterate over the possible core types.
|
||||
for (current_type_id = 1 ; current_type_id <= highest_core_id ; current_type_id++) {
|
||||
unsigned int core_num = 0;
|
||||
// Foreach core type, iterate the whole table and instantiate subdevices for each core.
|
||||
// Yes, this is O(n*m) but the actual runtime is small enough that it's an acceptable tradeoff.
|
||||
/*
|
||||
* Foreach core type, iterate the whole table and instantiate
|
||||
* subdevices for each core.
|
||||
* Yes, this is O(n*m) but the actual runtime is small enough
|
||||
* that it's an acceptable tradeoff.
|
||||
*/
|
||||
for (i = 0 ; i < pcard->core_table_length ; i++) {
|
||||
read_val = readq(pcard->sysinfo_regs_base + ((pcard->core_table_offset + i) * 8));
|
||||
read_val = readq(pcard->sysinfo_regs_base +
|
||||
((pcard->core_table_offset + i) * 8));
|
||||
parse_core_table_entry(&cte, read_val, pcard->core_table_rev);
|
||||
|
||||
if (cte.type != current_type_id)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user