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

Commit c067dfc6 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

sisusb_con warning fixes 



x86_64:

drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_putc':
drivers/usb/misc/sisusbvga/sisusb_con.c:405: warning: cast from pointer to integer of different size
drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_putcs':
drivers/usb/misc/sisusbvga/sisusb_con.c:440: warning: cast from pointer to integer of different size
drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_clear':
drivers/usb/misc/sisusbvga/sisusb_con.c:494: warning: cast from pointer to integer of different size
drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_bmove':
drivers/usb/misc/sisusbvga/sisusb_con.c:566: warning: cast from pointer to integer of different size
drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_switch':
drivers/usb/misc/sisusbvga/sisusb_con.c:614: warning: cast from pointer to integer of different size
drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_scroll_area':
drivers/usb/misc/sisusbvga/sisusb_con.c:941: warning: cast from pointer to integer of different size

Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c07be136

drivers/usb/misc/sisusbvga/sisusb_con.c

+6 −6
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x) 




	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),

				(u32)SISUSB_HADDR(x, y), 2, &written);

				(long)SISUSB_HADDR(x, y), 2, &written);



	mutex_unlock(&sisusb->lock);

}
@@ -438,7 +438,7 @@ sisusbcon_putcs(struct vc_data *c, const unsigned short *s, 
	}



	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),

				(u32)SISUSB_HADDR(x, y), count * 2, &written);

				(long)SISUSB_HADDR(x, y), count * 2, &written);



	mutex_unlock(&sisusb->lock);

}
@@ -492,7 +492,7 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int height, int width) 




	sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(x, y),

				(u32)SISUSB_HADDR(x, y), length, &written);

				(long)SISUSB_HADDR(x, y), length, &written);



	mutex_unlock(&sisusb->lock);

}
@@ -564,7 +564,7 @@ sisusbcon_bmove(struct vc_data *c, int sy, int sx, 




	sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(dx, dy),

				(u32)SISUSB_HADDR(dx, dy), length, &written);

				(long)SISUSB_HADDR(dx, dy), length, &written);



	mutex_unlock(&sisusb->lock);

}
@@ -612,7 +612,7 @@ sisusbcon_switch(struct vc_data *c) 
								length);



	sisusb_copy_memory(sisusb, (unsigned char *)c->vc_origin,

				(u32)SISUSB_HADDR(0, 0),

				(long)SISUSB_HADDR(0, 0),

				length, &written);



	mutex_unlock(&sisusb->lock);
@@ -939,7 +939,7 @@ sisusbcon_scroll_area(struct vc_data *c, struct sisusb_usb_data *sisusb, 
	}



	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(0, t),

				(u32)SISUSB_HADDR(0, t), length, &written);

				(long)SISUSB_HADDR(0, t), length, &written);



	mutex_unlock(&sisusb->lock);