Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b0225b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'drivers_soc_for_5.1' of... 

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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 187b4ac7 2b13ef1f

drivers/firmware/ti_sci.c

+2 −19
Original line number Diff line number Diff line
@@ -146,25 +146,8 @@ static int ti_sci_debug_show(struct seq_file *s, void *unused) 
	return 0;

}



/**

 * ti_sci_debug_open() - debug file open

 * @inode:	inode pointer

 * @file:	file pointer

 *

 * Return: result of single_open

 */

static int ti_sci_debug_open(struct inode *inode, struct file *file)

{

	return single_open(file, ti_sci_debug_show, inode->i_private);

}



/* log file operations */

static const struct file_operations ti_sci_debug_fops = {

	.open = ti_sci_debug_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

/* Provide the log file operations interface*/

DEFINE_SHOW_ATTRIBUTE(ti_sci_debug);



/**

 * ti_sci_debugfs_create() - Create log debug file

drivers/soc/ti/knav_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int pktdma_init_chan(struct knav_dma_device *dma, 


	INIT_LIST_HEAD(&chan->list);

	chan->dma	= dma;

	chan->direction	= DMA_NONE;

	chan->direction	= DMA_TRANS_NONE;

	atomic_set(&chan->ref_count, 0);

	spin_lock_init(&chan->lock);