History

Merge tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/drivers

soc: ti: couple of non critical fixes for v5.1 - Fix the Clang warning for enum in Navigator dma - Simplify code in ti_sci with DEFINE_SHOW_ATTRIBUTE macro * tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: soc: ti: knav_dma: Use proper enum in pktdma_init_chan firmware: ti_sci: Change to use DEFINE_SHOW_ATTRIBUTE macro

Arnd Bergmann committed 7 years ago

Commit 50b02252 parents 187b4ac 2b13ef12 files · +3 −20Browse files

Unified · Split

2 files
  1. drivers/firmware/ti_sci.c +2 −19
  2. drivers/soc/ti/knav_dma.c +1 −1
drivers/firmware/ti_sci.c+2−19
@@ -146,25 +146,8 @@ static int ti_sci_debug_show(struct seq_file *s, void *unused) · 145 unmodified lines
146 return 0;146 return 0;
147}147}
148 148
149/**149/* Provide the log file operations interface*/
150 * ti_sci_debug_open() - debug file open150DEFINE_SHOW_ATTRIBUTE(ti_sci_debug);
151 * @inode: inode pointer
152 * @file: file pointer
153 *
154 * Return: result of single_open
155 */
156static int ti_sci_debug_open(struct inode *inode, struct file *file)
157{
158 return single_open(file, ti_sci_debug_show, inode->i_private);
159}
160
161/* log file operations */
162static const struct file_operations ti_sci_debug_fops = {
163 .open = ti_sci_debug_open,
164 .read = seq_read,
165 .llseek = seq_lseek,
166 .release = single_release,
167};
168 151
169/**152/**
170 * ti_sci_debugfs_create() - Create log debug file153 * ti_sci_debugfs_create() - Create log debug file
drivers/soc/ti/knav_dma.c+1−1
@@ -598,7 +598,7 @@ static int pktdma_init_chan(struct knav_dma_device *dma, · 597 unmodified lines
598 598
599 INIT_LIST_HEAD(&chan->list);599 INIT_LIST_HEAD(&chan->list);
600 chan->dma = dma;600 chan->dma = dma;
601 chan->direction = DMA_NONE;601 chan->direction = DMA_TRANS_NONE;
602 atomic_set(&chan->ref_count, 0);602 atomic_set(&chan->ref_count, 0);
603 spin_lock_init(&chan->lock);603 spin_lock_init(&chan->lock);
604 604

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t