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

Commit 81b6032f authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: unisys: memregion: Eliminate visor_memregion_resize() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0dbb3fb6

drivers/staging/unisys/visorbus/visorchannel.c

+15 −2
Original line number Diff line number Diff line
@@ -89,10 +89,23 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, 
	if (uuid_le_cmp(guid, NULL_UUID_LE) == 0)

		guid = channel->chan_hdr.chtype;



	err = visor_memregion_resize(&channel->memregion, channel_bytes);

	if (err)

	iounmap(channel->memregion.mapped);

	release_mem_region(channel->memregion.physaddr,

			   channel->memregion.nbytes);

	channel->memregion.mapped = NULL;

	if (!request_mem_region(channel->memregion.physaddr, channel_bytes,

				MYDRVNAME))

		goto cleanup;



	channel->memregion.mapped = ioremap_cache(channel->memregion.physaddr,

						  channel_bytes);

	if (!channel->memregion.mapped) {

		release_mem_region(channel->memregion.physaddr, channel_bytes);

		goto cleanup;

	}



	channel->memregion.nbytes = channel_bytes;



	channel->size = channel_bytes;

	channel->guid = guid;

	return channel;

drivers/staging/unisys/visorutil/memregion.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ struct memregion { 
	void __iomem *mapped;

};



int visor_memregion_resize(struct memregion *memregion, ulong newsize);

int visor_memregion_read(struct memregion *memregion,

			 ulong offset, void *dest, ulong nbytes);

int visor_memregion_write(struct memregion *memregion,

drivers/staging/unisys/visorutil/memregion_direct.c

+0 −16
Original line number Diff line number Diff line
@@ -76,22 +76,6 @@ visor_memregion_get_pointer(struct memregion *memregion) 
}

EXPORT_SYMBOL_GPL(visor_memregion_get_pointer);



int

visor_memregion_resize(struct memregion *memregion, ulong newsize)

{

	int rc;



	if (newsize == memregion->nbytes)

		return 0;



	unmapit(memregion);

	memregion->nbytes = newsize;

	rc = mapit(memregion);



	return rc;

}

EXPORT_SYMBOL_GPL(visor_memregion_resize);



int

visor_memregion_read(struct memregion *memregion, ulong offset, void *dest,

		     ulong nbytes)