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

Commit e31ee22c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sps: Fix incompatible type assignment"

parents d91d4ade 9c9b4b00

drivers/platform/msm/sps/sps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2088,7 +2088,7 @@ int sps_register_bam_device(const struct sps_bam_props *bam_props, 
				unsigned long *dev_handle)

				unsigned long *dev_handle)

{

{

	struct sps_bam *bam = NULL;

	struct sps_bam *bam = NULL;

	void *virt_addr = NULL;

	void __iomem *virt_addr = NULL;

	char bam_name[MAX_MSG_LEN];

	char bam_name[MAX_MSG_LEN];

	u32 manage;

	u32 manage;

	int ok;

	int ok;

drivers/platform/msm/sps/sps_bam.h

+2 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -202,7 +202,7 @@ struct sps_bam { 
	/* BAM device state */

	/* BAM device state */

	u32 state;

	u32 state;

	struct mutex lock;

	struct mutex lock;

	void *base; /* BAM virtual base address */

	void __iomem *base; /* BAM virtual base address */

	u32 version;

	u32 version;

	spinlock_t isr_lock;

	spinlock_t isr_lock;

	spinlock_t connection_lock;

	spinlock_t connection_lock;

include/linux/msm-sps.h

+2 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -430,7 +430,7 @@ struct sps_bam_props { 




	u32 options;

	u32 options;

	phys_addr_t phys_addr;

	phys_addr_t phys_addr;

	void *virt_addr;

	void __iomem *virt_addr;

	u32 virt_size;

	u32 virt_size;

	u32 irq;

	u32 irq;

	u32 num_pipes;

	u32 num_pipes;