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

Commit 241be8d9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

capifunc warning fixes 



squish these:

drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferSet':
drivers/isdn/hardware/eicon/capifunc.c:192: warning: cast to pointer from integer of different size
drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferGet':
drivers/isdn/hardware/eicon/capifunc.c:197: warning: cast from pointer to integer of different size
drivers/isdn/hardware/eicon/capifunc.c:198: warning: cast from pointer to integer of different size
drivers/isdn/hardware/eicon/capifunc.c:200: warning: cast from pointer to integer of different size
drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferFree':
drivers/isdn/hardware/eicon/capifunc.c:205: warning: cast from pointer to integer of different size
drivers/isdn/hardware/eicon/capifunc.c:206: warning: cast from pointer to integer of different size
drivers/isdn/hardware/eicon/capifunc.c: In function 'sendf':
drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size
drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size
drivers/isdn/hardware/eicon/capifunc.c:321: warning: cast to pointer from integer of different size

Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5f1b194

drivers/isdn/hardware/eicon/capifunc.c

+8 −8
Original line number Diff line number Diff line
@@ -189,21 +189,21 @@ void *TransmitBufferSet(APPL * appl, dword ref) 
{

	appl->xbuffer_used[ref] = true;

	DBG_PRV1(("%d:xbuf_used(%d)", appl->Id, ref + 1))

	    return (void *) ref;

	    return (void *)(long)ref;

}



void *TransmitBufferGet(APPL * appl, void *p)

{

	if (appl->xbuffer_internal[(dword) p])

		return appl->xbuffer_internal[(dword) p];

	if (appl->xbuffer_internal[(dword)(long)p])

		return appl->xbuffer_internal[(dword)(long)p];



	return appl->xbuffer_ptr[(dword) p];

	return appl->xbuffer_ptr[(dword)(long)p];

}



void TransmitBufferFree(APPL * appl, void *p)

{

	appl->xbuffer_used[(dword) p] = false;

	DBG_PRV1(("%d:xbuf_free(%d)", appl->Id, ((dword) p) + 1))

	appl->xbuffer_used[(dword)(long)p] = false;

	DBG_PRV1(("%d:xbuf_free(%d)", appl->Id, ((dword)(long)p) + 1))

}



void *ReceiveBufferGet(APPL * appl, int Num)
@@ -301,7 +301,7 @@ void sendf(APPL * appl, word command, dword Id, word Number, byte * format, ...) 
	/* if DATA_B3_IND, copy data too */

	if (command == _DATA_B3_I) {

		dword data = GET_DWORD(&msg.info.data_b3_ind.Data);

		memcpy(write + length, (void *) data, dlength);

		memcpy(write + length, (void *)(long)data, dlength);

	}



#ifndef DIVA_NO_DEBUGLIB
@@ -318,7 +318,7 @@ void sendf(APPL * appl, word command, dword Id, word Number, byte * format, ...) 
			if (myDriverDebugHandle.dbgMask & DL_BLK) {

				xlog("\x00\x02", &msg, 0x81, length);

				for (i = 0; i < dlength; i += 256) {

				  DBG_BLK((((char *) GET_DWORD(&msg.info.data_b3_ind.Data)) + i,

				  DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i,

				  	((dlength - i) < 256) ? (dlength - i) : 256))

				  if (!(myDriverDebugHandle.dbgMask & DL_PRV0))

					  break; /* not more if not explicitely requested */