From patchwork Thu Dec 27 13:13:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 209015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 86AF42C0098 for ; Wed, 2 Jan 2013 23:00:40 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TqMzT-0001oV-VK; Wed, 02 Jan 2013 12:00:12 +0000 Received: from mail-bk0-f47.google.com ([209.85.214.47]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ToDHS-0001ge-1t for kernel-team@lists.ubuntu.com; Thu, 27 Dec 2012 13:13:50 +0000 Received: by mail-bk0-f47.google.com with SMTP id j4so4208550bkw.6 for ; Thu, 27 Dec 2012 05:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:subject:from:to:cc:date:content-type:x-mailer :mime-version:content-transfer-encoding; bh=DJKQC2TLc7oCPfeecT4uAewNFbz8osaumjjIeilXCMM=; b=1FLk2JL8RU9xFhvSglUtc7xpuEJbfTG7loeWTXNAToVcvoQzYtsBeyL1FcF0YDWeCn C2VY35l6XX0d3vsZoA8gLrNQY7h0cpsshHlms9bnLy4f22wvkTqO8mM6QHtwkARHpYMN 2p3dnJfPtx44RwPuEv4wHFxNDytAhysC20TQVc3zy1PEHlilapfi4TyL0bTKn0Bk+NcW LXqcsEpyetA+tbe7ONhejJKk2GlfQ/vuZqQEQ/bPd08nEJH6IZqu6d5hhHPCNS+7TCLf AB3RUY6FeMBh/cpJ7eMLG6amIXs3dnm+bABNn8NmB1Nl15Sohcp74FyDtY3eVCQ0g0p5 SX2w== X-Received: by 10.204.13.12 with SMTP id z12mr15030273bkz.58.1356614029794; Thu, 27 Dec 2012 05:13:49 -0800 (PST) Received: from [192.168.1.100] (94.196.41.202.threembb.co.uk. [94.196.41.202]) by mx.google.com with ESMTPS id m20sm20514405bkw.4.2012.12.27.05.13.47 (version=SSLv3 cipher=OTHER); Thu, 27 Dec 2012 05:13:48 -0800 (PST) Message-ID: <1356614023.3447.43.camel@canaries64> Subject: [PATCH upstream for stable 5/8]staging: vt6656: 64 bit fixes : correct all type sizes From: Malcolm Priestley To: stable@vger.kernel.org Date: Thu, 27 Dec 2012 13:13:43 +0000 X-Mailer: Evolution 3.6.2-0ubuntu2 Mime-Version: 1.0 X-Mailman-Approved-At: Wed, 02 Jan 2013 12:00:07 +0000 Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com upstream commit 7730492855a2f9c828599bcd8d62760f96d319e4 Tested on kernels 2.6.35, 3.0, 3.2, 3.5 & 3.7 staging: vt6656: 64 bit fixes : correct all type sizes After this patch all BYTE/WORD/DWORD types can be replaced with the appropriate u sizes. Cc: stable@kernel.org # 2.6.35+ Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 0f70562c..dfbf747 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -44,9 +44,9 @@ typedef int BOOL; /****** Simple typedefs ***************************************************/ -typedef unsigned char BYTE; // 8-bit -typedef unsigned short WORD; // 16-bit -typedef unsigned long DWORD; // 32-bit +typedef u8 BYTE; +typedef u16 WORD; +typedef u32 DWORD; // QWORD is for those situation that we want // an 8-byte-aligned 8 byte long structure @@ -62,8 +62,8 @@ typedef UQuadWord QWORD; // 64-bit /****** Common pointer types ***********************************************/ -typedef unsigned long ULONG_PTR; // 32-bit -typedef unsigned long DWORD_PTR; // 32-bit +typedef u32 ULONG_PTR; +typedef u32 DWORD_PTR; // boolean pointer