[2.4.23] fix some DRM43 warnings
PATCH 1/1 [2.4.23] fix some DRM43 warnings
[Resend. Was ignored for 2.4.23-pre :-(]
This patch fixes three sources of warnings in the new 4.3 DRM code:
- drm_os_linux.h has a #warning on broken list_entry usage. The patch backports a fix from the 2.6 code.
- radeon_drv.h has a #warning PCI posting bug.
The #warning refers to an obsolete and unused macro. Simply remove it. It's also gone from the 2.6 code.
- drm_agpsupport.h generates a gcc warning on an assignment used as a truth value.
The patch backports a fix from the 2.6 code.
These changes are well-tested: they have been in 2.6 for ages, and I've been running them in 2.4.23-pre/rc for months. Please apply.
/Mikael
drivers/char/drm/drm_agpsupport.h +1 -1
@@ -79,7 +79,7 @@return -EBUSY ;if (!drm_agp->acquire)return -EINVAL ; -if (retcode = drm_agp->acquire ()) +if ((retcode = drm_agp->acquire ()))return retcode; dev->agp->acquired =1 ;return 0 ;
drivers/char/drm/drm_os_linux.h +2 -4
@@ -13,12 +13,10 @@ return -EFAULT -#warning the author of this code needs to read up on list_entry#define DRM_GETSAREA () \ do { \ - struct list_head *list; \ - list_for_each( list, &dev->maplist->head ) { \ - drm_map_list_t *entry = (drm_map_list_t *)list; \ + drm_map_list_t *entry; \ + list_for_each_entry( entry, &dev->maplist->head, head ) { \ if ( entry->map && \ entry->map->type == _DRM_SHM && \ (entry->map->flags & _DRM_CONTAINS_LOCK) ) { \
drivers/char/drm/radeon_drv.h +0 -8
@@ -839,14 +839,6 @@* Ring control */ -#if defined(__powerpc__) -#define radeon_flush_write_combine () (void) GET_RING_HEAD( &dev_priv->ring ) -#else -#define radeon_flush_write_combine () wmb() -#warning PCI posting bug -#endif - -#define RADEON_VERBOSE 0#define RING_LOCALS int write, _nr; unsigned int mask; u32 *ring;