Merge tag 'drivers_soc_for_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
soc: driver soc update for v4.20 - Enable host-id as an optional dt property - Fix minor typo in knav driver * tag 'drivers_soc_for_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: soc: ti: fix spelling mistake "instace" -> "instance" firmware: ti_sci: Provide host-id as an optional dt parameter Documentation: dt: keystone: ti-sci: Add optional host-id parameter Signed-off-by: Olof Johansson <olof@lixom.net>
Цей коміт міститься в:
@@ -438,7 +438,7 @@ void *knav_dma_open_channel(struct device *dev, const char *name,
|
||||
|
||||
chan_num = of_channel_match_helper(dev->of_node, name, &instance);
|
||||
if (chan_num < 0) {
|
||||
dev_err(kdev->dev, "No DMA instace with name %s\n", name);
|
||||
dev_err(kdev->dev, "No DMA instance with name %s\n", name);
|
||||
return (void *)-EINVAL;
|
||||
}
|
||||
|
||||
@@ -461,7 +461,7 @@ void *knav_dma_open_channel(struct device *dev, const char *name,
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
dev_err(kdev->dev, "No DMA instace with name %s\n", instance);
|
||||
dev_err(kdev->dev, "No DMA instance with name %s\n", instance);
|
||||
return (void *)-EINVAL;
|
||||
}
|
||||
|
||||
|
@@ -240,14 +240,14 @@ struct knav_pool {
|
||||
};
|
||||
|
||||
/**
|
||||
* struct knav_queue_inst: qmss queue instace properties
|
||||
* struct knav_queue_inst: qmss queue instance properties
|
||||
* @descs: descriptor pointer
|
||||
* @desc_head, desc_tail, desc_count: descriptor counters
|
||||
* @acc: accumulator channel pointer
|
||||
* @kdev: qmss device pointer
|
||||
* @range: range info
|
||||
* @qmgr: queue manager info
|
||||
* @id: queue instace id
|
||||
* @id: queue instance id
|
||||
* @irq_num: irq line number
|
||||
* @notify_needed: notifier needed based on queue type
|
||||
* @num_notifiers: total notifiers
|
||||
@@ -274,7 +274,7 @@ struct knav_queue_inst {
|
||||
/**
|
||||
* struct knav_queue: qmss queue properties
|
||||
* @reg_push, reg_pop, reg_peek: push, pop queue registers
|
||||
* @inst: qmss queue instace properties
|
||||
* @inst: qmss queue instance properties
|
||||
* @notifier_fn: notifier function
|
||||
* @notifier_fn_arg: notifier function argument
|
||||
* @notifier_enabled: notier enabled for a give queue
|
||||
|
Посилання в новій задачі
Заблокувати користувача