[kernel] r15222 - in dists/trunk/linux-2.6/debian/patches: features/all series
Ben Hutchings
benh at alioth.debian.org
Fri Feb 19 03:53:52 UTC 2010
Author: benh
Date: Fri Feb 19 03:53:50 2010
New Revision: 15222
Log:
Fix up features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch for 2.6.33-rc8
Modified:
dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch Fri Feb 19 03:51:14 2010 (r15221)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch Fri Feb 19 03:53:50 2010 (r15222)
@@ -1,91 +1,87 @@
-From 6c628a539fe6953bfe6112d75c7fbb1f9409a086 Mon Sep 17 00:00:00 2001
+From fb9c62c3bbf88aa3a3c9bb0c9feb26740eb29ddf Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 28 Jun 2009 15:49:17 +0100
-Subject: [PATCH] rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
+Date: Mon, 18 Jan 2010 02:50:24 +0000
+Subject: [PATCH] Staging: rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
These functions do not modify the data they are passed.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/rt2860/rtmp.h | 6 +++---
drivers/staging/rt2870/common/rtusb_io.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
-index 90fd40f..d283256 100644
+index c50abf4..6c6503d 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
-@@ -6095,13 +6095,13 @@ NTSTATUS RTUSBMultiRead(
- NTSTATUS RTUSBMultiWrite(
- IN PRTMP_ADAPTER pAd,
- IN USHORT Offset,
-- IN PUCHAR pData,
-+ IN const u8 *pData,
- IN USHORT length);
-
- NTSTATUS RTUSBMultiWrite_OneByte(
- IN PRTMP_ADAPTER pAd,
- IN USHORT Offset,
-- IN PUCHAR pData);
-+ IN const u8 *pData);
-
- NTSTATUS RTUSBReadBBPRegister(
- IN PRTMP_ADAPTER pAd,
-@@ -6220,7 +6220,7 @@ NTSTATUS RTUSBFirmwareRun(
-
- NTSTATUS RTUSBFirmwareWrite(
- IN PRTMP_ADAPTER pAd,
-- IN PUCHAR pFwImage,
-+ IN const u8 *pFwImage,
- IN ULONG FwLen);
+@@ -4043,10 +4043,10 @@ int RTUSBMultiRead(struct rt_rtmp_adapter *pAd,
+ u16 Offset, u8 *pData, u16 length);
+
+ int RTUSBMultiWrite(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData, u16 length);
++ u16 Offset, const u8 *pData, u16 length);
+
+ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData);
++ u16 Offset, const u8 *pData);
+
+ int RTUSBReadBBPRegister(struct rt_rtmp_adapter *pAd,
+ u8 Id, u8 *pValue);
+@@ -4112,7 +4112,7 @@ int RTUSBSingleWrite(struct rt_rtmp_adapter *pAd,
+ u16 Offset, u16 Value);
+
+ int RTUSBFirmwareWrite(struct rt_rtmp_adapter *pAd,
+- u8 *pFwImage, unsigned long FwLen);
++ const u8 *pFwImage, unsigned long FwLen);
+
+ int RTUSBVenderReset(struct rt_rtmp_adapter *pAd);
- NTSTATUS RTUSBFirmwareOpmode(
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
-index 1d69590..1f776c4 100644
+index 34443f2..cf0d2f5 100644
--- a/drivers/staging/rt2870/common/rtusb_io.c
+++ b/drivers/staging/rt2870/common/rtusb_io.c
-@@ -92,7 +92,7 @@ NTSTATUS RTUSBFirmwareRun(
+@@ -84,7 +84,7 @@ static int RTUSBFirmwareRun(struct rt_rtmp_adapter *pAd)
+ ========================================================================
*/
- NTSTATUS RTUSBFirmwareWrite(
- IN PRTMP_ADAPTER pAd,
-- IN PUCHAR pFwImage,
-+ IN const u8 *pFwImage,
- IN ULONG FwLen)
+ int RTUSBFirmwareWrite(struct rt_rtmp_adapter *pAd,
+- u8 *pFwImage, unsigned long FwLen)
++ const u8 *pFwImage, unsigned long FwLen)
{
- UINT32 MacReg;
-@@ -224,7 +224,7 @@ NTSTATUS RTUSBMultiRead(
- NTSTATUS RTUSBMultiWrite_OneByte(
- IN PRTMP_ADAPTER pAd,
- IN USHORT Offset,
-- IN PUCHAR pData)
-+ IN const u8 *pData)
+ u32 MacReg;
+ int Status;
+@@ -167,7 +167,7 @@ int RTUSBMultiRead(struct rt_rtmp_adapter *pAd,
+ ========================================================================
+ */
+ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData)
++ u16 Offset, const u8 *pData)
{
- NTSTATUS Status;
+ int Status;
-@@ -236,7 +236,7 @@ NTSTATUS RTUSBMultiWrite_OneByte(
- 0x6,
- 0,
- Offset,
-- pData,
-+ (u8 *)pData,
- 1);
+@@ -175,18 +175,18 @@ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+ Status = RTUSB_VendorRequest(pAd,
+ USBD_TRANSFER_DIRECTION_OUT,
+ DEVICE_VENDOR_REQUEST_OUT,
+- 0x6, 0, Offset, pData, 1);
++ 0x6, 0, Offset, (u8 *)pData, 1);
return Status;
-@@ -245,14 +245,14 @@ NTSTATUS RTUSBMultiWrite_OneByte(
- NTSTATUS RTUSBMultiWrite(
- IN PRTMP_ADAPTER pAd,
- IN USHORT Offset,
-- IN PUCHAR pData,
-+ IN const u8 *pData,
- IN USHORT length)
- {
- NTSTATUS Status;
+ }
+ int RTUSBMultiWrite(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData, u16 length)
++ u16 Offset, const u8 *pData, u16 length)
+ {
+ int Status;
- USHORT index = 0,Value;
-- PUCHAR pSrc = pData;
-+ const u8 *pSrc = pData;
- USHORT resude = 0;
+ u16 index = 0, Value;
+- u8 *pSrc = pData;
++ const u8 *pSrc = pData;
+ u16 resude = 0;
- resude = length % 2;
+ resude = length % 2;
--
-1.6.6
+1.6.6.2
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Fri Feb 19 03:51:14 2010 (r15221)
+++ dists/trunk/linux-2.6/debian/patches/series/base Fri Feb 19 03:53:50 2010 (r15222)
@@ -9,6 +9,7 @@
+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
++ features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
+ features/all/rt28x0sta-use-request_firmware.patch
+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
+ features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
More information about the Kernel-svn-changes
mailing list