* [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
[not found] ` <1269821357.8653.231.camel@localhost>
@ 2010-03-29 0:24 ` Ben Hutchings
2010-03-29 1:52 ` FUJITA Tomonori
2010-04-28 17:39 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Ben Hutchings @ 2010-03-29 0:24 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz, Greg Kroah-Hartman; +Cc: linux-wireless, LKML
[-- Attachment #1: Type: text/plain, Size: 3604 bytes --]
To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
change the type of the first parameter to linux_pci_{map,unmap}_single()
from void * to struct rt_rtmp_adapter *. Also do not define the macros
PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
not used and if they were that would be a bug.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/staging/rt2860/rt_linux.h | 14 +++++---------
drivers/staging/rt2860/rt_pci_rbus.c | 12 ++++--------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index a7c540f..b370fb2 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -455,10 +455,11 @@ void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen);
* Device DMA Access related definitions and data structures.
**********************************************************************************/
#ifdef RTMP_MAC_PCI
-dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
- int sd_idx, int direction);
-void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size,
- int direction);
+struct rt_rtmp_adapter;
+dma_addr_t linux_pci_map_single(struct rt_rtmp_adapter *pAd, void *ptr,
+ size_t size, int sd_idx, int direction);
+void linux_pci_unmap_single(struct rt_rtmp_adapter *pAd, dma_addr_t dma_addr,
+ size_t size, int direction);
#define PCI_MAP_SINGLE(_handle, _ptr, _size, _sd_idx, _dir) \
linux_pci_map_single(_handle, _ptr, _size, _sd_idx, _dir)
@@ -475,11 +476,6 @@ void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size,
#define DEV_ALLOC_SKB(_length) \
dev_alloc_skb(_length)
#endif /* RTMP_MAC_PCI // */
-#ifdef RTMP_MAC_USB
-#define PCI_MAP_SINGLE(_handle, _ptr, _size, _dir) (unsigned long)0
-
-#define PCI_UNMAP_SINGLE(_handle, _ptr, _size, _dir)
-#endif /* RTMP_MAC_USB // */
/*
* unsigned long
diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c
index e0a0aee..acdf09f 100644
--- a/drivers/staging/rt2860/rt_pci_rbus.c
+++ b/drivers/staging/rt2860/rt_pci_rbus.c
@@ -790,10 +790,9 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance)
* invaild or writeback cache
* and convert virtual address to physical address
*/
-dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
- int sd_idx, int direction)
+dma_addr_t linux_pci_map_single(struct rt_rtmp_adapter *pAd, void *ptr,
+ size_t size, int sd_idx, int direction)
{
- struct rt_rtmp_adapter *pAd;
struct os_cookie *pObj;
/*
@@ -812,7 +811,6 @@ dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
sd_idx = -1
*/
- pAd = (struct rt_rtmp_adapter *)handle;
pObj = (struct os_cookie *)pAd->OS_Cookie;
if (sd_idx == 1) {
@@ -826,13 +824,11 @@ dma_addr_t linux_pci_map_single(void *handle, void *ptr, size_t size,
}
-void linux_pci_unmap_single(void *handle, dma_addr_t dma_addr, size_t size,
- int direction)
+void linux_pci_unmap_single(struct rt_rtmp_adapter *pAd, dma_addr_t dma_addr,
+ size_t size, int direction)
{
- struct rt_rtmp_adapter *pAd;
struct os_cookie *pObj;
- pAd = (struct rt_rtmp_adapter *)handle;
pObj = (struct os_cookie *)pAd->OS_Cookie;
pci_unmap_single(pObj->pci_dev, dma_addr, size, direction);
--
1.7.0.3
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
2010-03-29 0:24 ` [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe Ben Hutchings
@ 2010-03-29 1:52 ` FUJITA Tomonori
2010-03-29 1:58 ` Ben Hutchings
2010-04-28 17:39 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: FUJITA Tomonori @ 2010-03-29 1:52 UTC (permalink / raw)
To: ben; +Cc: bzolnier, gregkh, linux-wireless, linux-kernel
On Mon, 29 Mar 2010 01:24:45 +0100
Ben Hutchings <ben@decadent.org.uk> wrote:
> To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
> change the type of the first parameter to linux_pci_{map,unmap}_single()
> from void * to struct rt_rtmp_adapter *. Also do not define the macros
> PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
> not used and if they were that would be a bug.
>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> drivers/staging/rt2860/rt_linux.h | 14 +++++---------
> drivers/staging/rt2860/rt_pci_rbus.c | 12 ++++--------
> 2 files changed, 9 insertions(+), 17 deletions(-)
I think using dma_map_single directly instead of inventing a wrapper
function make the code more readable.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
2010-03-29 1:52 ` FUJITA Tomonori
@ 2010-03-29 1:58 ` Ben Hutchings
2010-03-29 2:04 ` FUJITA Tomonori
0 siblings, 1 reply; 6+ messages in thread
From: Ben Hutchings @ 2010-03-29 1:58 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: bzolnier, gregkh, linux-wireless, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]
On Mon, 2010-03-29 at 10:52 +0900, FUJITA Tomonori wrote:
> On Mon, 29 Mar 2010 01:24:45 +0100
> Ben Hutchings <ben@decadent.org.uk> wrote:
>
> > To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
> > change the type of the first parameter to linux_pci_{map,unmap}_single()
> > from void * to struct rt_rtmp_adapter *. Also do not define the macros
> > PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
> > not used and if they were that would be a bug.
> >
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > ---
> > drivers/staging/rt2860/rt_linux.h | 14 +++++---------
> > drivers/staging/rt2860/rt_pci_rbus.c | 12 ++++--------
> > 2 files changed, 9 insertions(+), 17 deletions(-)
>
> I think using dma_map_single directly instead of inventing a wrapper
> function make the code more readable.
These functions are not quite simple wrappers, unfortunately. So while
I think that is worth doing it is a separate change.
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
2010-03-29 1:58 ` Ben Hutchings
@ 2010-03-29 2:04 ` FUJITA Tomonori
2010-04-28 18:19 ` drago01
0 siblings, 1 reply; 6+ messages in thread
From: FUJITA Tomonori @ 2010-03-29 2:04 UTC (permalink / raw)
To: ben; +Cc: fujita.tomonori, bzolnier, gregkh, linux-wireless, linux-kernel
On Mon, 29 Mar 2010 02:58:48 +0100
Ben Hutchings <ben@decadent.org.uk> wrote:
> On Mon, 2010-03-29 at 10:52 +0900, FUJITA Tomonori wrote:
> > On Mon, 29 Mar 2010 01:24:45 +0100
> > Ben Hutchings <ben@decadent.org.uk> wrote:
> >
> > > To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
> > > change the type of the first parameter to linux_pci_{map,unmap}_single()
> > > from void * to struct rt_rtmp_adapter *. Also do not define the macros
> > > PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
> > > not used and if they were that would be a bug.
> > >
> > > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > > ---
> > > drivers/staging/rt2860/rt_linux.h | 14 +++++---------
> > > drivers/staging/rt2860/rt_pci_rbus.c | 12 ++++--------
> > > 2 files changed, 9 insertions(+), 17 deletions(-)
> >
> > I think using dma_map_single directly instead of inventing a wrapper
> > function make the code more readable.
>
> These functions are not quite simple wrappers, unfortunately. So while
> I think that is worth doing it is a separate change.
Well, the current wrapper functions looks terrible. Needs to fix them
before moving the driver out of the staging anyway, I think.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
2010-03-29 0:24 ` [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe Ben Hutchings
2010-03-29 1:52 ` FUJITA Tomonori
@ 2010-04-28 17:39 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2010-04-28 17:39 UTC (permalink / raw)
To: Ben Hutchings
Cc: Bartlomiej Zolnierkiewicz, Greg Kroah-Hartman, linux-wireless, LKML
On Mon, Mar 29, 2010 at 01:24:45AM +0100, Ben Hutchings wrote:
> To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
> change the type of the first parameter to linux_pci_{map,unmap}_single()
> from void * to struct rt_rtmp_adapter *. Also do not define the macros
> PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
> not used and if they were that would be a bug.
>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
In the future, please do not sign your emails, it just makes it harder
to apply them :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe
2010-03-29 2:04 ` FUJITA Tomonori
@ 2010-04-28 18:19 ` drago01
0 siblings, 0 replies; 6+ messages in thread
From: drago01 @ 2010-04-28 18:19 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: ben, bzolnier, gregkh, linux-wireless, linux-kernel
On Mon, Mar 29, 2010 at 4:04 AM, FUJITA Tomonori
<fujita.tomonori@lab.ntt.co.jp> wrote:
> On Mon, 29 Mar 2010 02:58:48 +0100
> Ben Hutchings <ben@decadent.org.uk> wrote:
>
>> On Mon, 2010-03-29 at 10:52 +0900, FUJITA Tomonori wrote:
>> > On Mon, 29 Mar 2010 01:24:45 +0100
>> > Ben Hutchings <ben@decadent.org.uk> wrote:
>> >
>> > > To avoid recurrence of bugs such as <http://bugs.debian.org/575726>,
>> > > change the type of the first parameter to linux_pci_{map,unmap}_single()
>> > > from void * to struct rt_rtmp_adapter *. Also do not define the macros
>> > > PCI_{MAP,UNMAP}_SINGLE() when building the rt2870sta driver; they are
>> > > not used and if they were that would be a bug.
>> > >
>> > > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
>> > > ---
>> > > drivers/staging/rt2860/rt_linux.h | 14 +++++---------
>> > > drivers/staging/rt2860/rt_pci_rbus.c | 12 ++++--------
>> > > 2 files changed, 9 insertions(+), 17 deletions(-)
>> >
>> > I think using dma_map_single directly instead of inventing a wrapper
>> > function make the code more readable.
>>
>> These functions are not quite simple wrappers, unfortunately. So while
>> I think that is worth doing it is a separate change.
>
> Well, the current wrapper functions looks terrible. Needs to fix them
> before moving the driver out of the staging anyway, I think.
The driver is not expected to make it ever out of staging ... unless
someone ports it to mac80211 ... the in kernel rt2x00 drivers are the
longer term solutions for supporting this hardware.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-04-28 18:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <alpine.DEB.2.00.1003282040480.4731@ernie.pinecrest>
[not found] ` <1269821357.8653.231.camel@localhost>
2010-03-29 0:24 ` [PATCH] rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe Ben Hutchings
2010-03-29 1:52 ` FUJITA Tomonori
2010-03-29 1:58 ` Ben Hutchings
2010-03-29 2:04 ` FUJITA Tomonori
2010-04-28 18:19 ` drago01
2010-04-28 17:39 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).