Altix - Remove alenlist.h
PATCH 1/1 Altix - Remove alenlist.h
Hi Andrew,
This is a patch that removes the unused include/asm-ia64/sn/alenlist.h header file, along with the dead code that still referenced it.
I ran the patch by Pat Gefre and Colin Ngam.
The patch is against 2.6.1-rc3-mm1.
Thanks
mh
Signature · 2 lines
Martin Hicks Wild Open Source Inc. [email protected] 613-266-2296
arch/ia64/sn/io/io.c +22 -81
@@ -471,38 +471,8 @@ }/* -* Establish a DMA mapping using the resources allocated in a previous dmamap_alloc. -* Return an appropriate crosstalk address list that maps to the specified physical -* address list. -*/ -/* ARGSUSED */ -alenlist_t -hub_dmamap_list (hub_dmamap_t hub_dmamap,/* use these mapping resources */ -alenlist_t palenlist,/* map this area of memory */ -unsigned flags) -{ -vertex_hdl_t vhdl; - -ASSERT (hub_dmamap->hdma_flags &HUB_DMAMAP_IS_VALID ); - -if (hub_dmamap->hdma_flags &HUB_DMAMAP_USED ) { -/* If the map is FIXED, re-use is OK. */ -if (!(hub_dmamap->hdma_flags &HUB_DMAMAP_IS_FIXED )) { -char name[MAXDEVNAME ]; - vhdl = hub_dmamap->hdma_xtalk_info.xd_dev; -printk (KERN_WARNING "%s: hub_dmamap_list re-uses dmamap\n" ,vertex_to_name (vhdl, name,MAXDEVNAME )); - } - }else { - hub_dmamap->hdma_flags |=HUB_DMAMAP_USED ; - } - -/* There isn't actually any DMA mapping hardware on the hub. */ -return palenlist; -} - -/* * Driver indicates that it has completed whatever DMA it may have started -* after an earlier dmamap_addr or dmamap_list call. +* after an earlier dmamap_addr call. */ void hub_dmamap_done (hub_dmamap_t hub_dmamap)/* done with these mapping resources */
@@ -535,23 +505,6 @@return (PHYS_TO_DMA (paddr)); } -/* -* Translate a list of IP27 addresses and lengths into a list of crosstalk -* addresses and lengths. No actual hardware mapping takes place; the hub -* has no DMA mapping registers -- crosstalk addresses map directly. -*/ -/* ARGSUSED */ -alenlist_t -hub_dmatrans_list (vertex_hdl_t dev,/* translate for this device */ -device_desc_t dev_desc,/* device descriptor */ -alenlist_t palenlist,/* system address/length list */ -unsigned flags)/* defined in dma.h */ -{ -BUG (); -/* no translation needed */ -return palenlist; -} -/*ARGSUSED*/ void hub_dmamap_drain (hub_dmamap_t map)
@@ -568,15 +521,6 @@/* XXX- flush caches, if cache coherency WAR is needed */ } -/*ARGSUSED*/ -void -hub_dmalist_drain (vertex_hdl_t vhdl, -alenlist_t list) -{ -/* XXX- flush caches, if cache coherency WAR is needed */ -} - -/* CONFIGURATION MANAGEMENT */
@@ -768,28 +712,25 @@* crosstalk bus provider. */ xtalk_provider_t hub_provider = { - (xtalk_piomap_alloc_f *) hub_piomap_alloc, - (xtalk_piomap_free_f *) hub_piomap_free, - (xtalk_piomap_addr_f *) hub_piomap_addr, - (xtalk_piomap_done_f *) hub_piomap_done, - (xtalk_piotrans_addr_f *) hub_piotrans_addr, - - (xtalk_dmamap_alloc_f *) hub_dmamap_alloc, - (xtalk_dmamap_free_f *) hub_dmamap_free, - (xtalk_dmamap_addr_f *) hub_dmamap_addr, - (xtalk_dmamap_list_f *) hub_dmamap_list, - (xtalk_dmamap_done_f *) hub_dmamap_done, - (xtalk_dmatrans_addr_f *) hub_dmatrans_addr, - (xtalk_dmatrans_list_f *) hub_dmatrans_list, - (xtalk_dmamap_drain_f *) hub_dmamap_drain, - (xtalk_dmaaddr_drain_f *) hub_dmaaddr_drain, - (xtalk_dmalist_drain_f *) hub_dmalist_drain, - - (xtalk_intr_alloc_f *) hub_intr_alloc, - (xtalk_intr_alloc_f *) hub_intr_alloc_nothd, - (xtalk_intr_free_f *) hub_intr_free, - (xtalk_intr_connect_f *) hub_intr_connect, - (xtalk_intr_disconnect_f *) hub_intr_disconnect, - (xtalk_provider_startup_f *) hub_provider_startup, - (xtalk_provider_shutdown_f *) hub_provider_shutdown, + .piomap_alloc = (xtalk_piomap_alloc_f *) hub_piomap_alloc, + .piomap_free = (xtalk_piomap_free_f *) hub_piomap_free, + .piomap_addr = (xtalk_piomap_addr_f *) hub_piomap_addr, + .piomap_done = (xtalk_piomap_done_f *) hub_piomap_done, + .piotrans_addr = (xtalk_piotrans_addr_f *) hub_piotrans_addr, + + .dmamap_alloc = (xtalk_dmamap_alloc_f *) hub_dmamap_alloc, + .dmamap_free = (xtalk_dmamap_free_f *) hub_dmamap_free, + .dmamap_addr = (xtalk_dmamap_addr_f *) hub_dmamap_addr, + .dmamap_done = (xtalk_dmamap_done_f *) hub_dmamap_done, + .dmatrans_addr = (xtalk_dmatrans_addr_f *) hub_dmatrans_addr, + .dmamap_drain = (xtalk_dmamap_drain_f *) hub_dmamap_drain, + .dmaaddr_drain = (xtalk_dmaaddr_drain_f *) hub_dmaaddr_drain, + + .intr_alloc = (xtalk_intr_alloc_f *) hub_intr_alloc, + .intr_alloc_nothd = (xtalk_intr_alloc_f *) hub_intr_alloc_nothd, + .intr_free = (xtalk_intr_free_f *) hub_intr_free, + .intr_connect = (xtalk_intr_connect_f *) hub_intr_connect, + .intr_disconnect = (xtalk_intr_disconnect_f *) hub_intr_disconnect, + .provider_startup = (xtalk_provider_startup_f *) hub_provider_startup, + .provider_shutdown = (xtalk_provider_shutdown_f *) hub_provider_shutdown, };
arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c +0 -12
@@ -106,7 +106,6 @@iopaddr_t pcibr_dmatrans_addr (vertex_hdl_t ,device_desc_t ,paddr_t ,size_t ,unsigned );void pcibr_dmamap_drain (pcibr_dmamap_t );void pcibr_dmaaddr_drain (vertex_hdl_t ,paddr_t ,size_t ); -void pcibr_dmalist_drain (vertex_hdl_t ,alenlist_t );iopaddr_t pcibr_dmamap_pciaddr_get (pcibr_dmamap_t );void pcibr_provider_startup (vertex_hdl_t );
@@ -2327,17 +2326,6 @@xtalk_dmaaddr_drain (xconn_vhdl, paddr, bytes); } -void -pcibr_dmalist_drain (vertex_hdl_t pconn_vhdl, -alenlist_t list) -{ -pciio_info_t pciio_info =pciio_info_get (pconn_vhdl); -pcibr_soft_t pcibr_soft = (pcibr_soft_t )pciio_info_mfast_get (pciio_info); -vertex_hdl_t xconn_vhdl = pcibr_soft->bs_conn; - -xtalk_dmalist_drain (xconn_vhdl, list); -} -/* * Get the starting PCIbus address out of the given DMA map. * This function is supposed to be used by a close friend of PCI bridge
arch/ia64/sn/io/sn2/pciio.c +0 -7
@@ -304,13 +304,6 @@ (dev, addr, size); } -void -pciio_dmalist_drain (vertex_hdl_t dev,alenlist_t list) -{ -DEV_FUNC (dev, dmalist_drain) - (dev, list); -} -/* ===================================================================== * INTERRUPT MANAGEMENT *
arch/ia64/sn/io/sn2/pic.c +0 -1
@@ -805,7 +805,6 @@ (pciio_dmatrans_addr_f *) pcibr_dmatrans_addr, (pciio_dmamap_drain_f *) pcibr_dmamap_drain, (pciio_dmaaddr_drain_f *) pcibr_dmaaddr_drain, - (pciio_dmalist_drain_f *) pcibr_dmalist_drain, (pciio_intr_alloc_f *) pcibr_intr_alloc, (pciio_intr_free_f *) pcibr_intr_free,
arch/ia64/sn/io/sn2/xtalk.c +0 -30
@@ -47,13 +47,10 @@xtalk_dmamap_t xtalk_dmamap_alloc (vertex_hdl_t ,device_desc_t ,size_t ,unsigned );void xtalk_dmamap_free (xtalk_dmamap_t );iopaddr_t xtalk_dmamap_addr (xtalk_dmamap_t ,paddr_t ,size_t ); -alenlist_t xtalk_dmamap_list (xtalk_dmamap_t ,alenlist_t ,unsigned );void xtalk_dmamap_done (xtalk_dmamap_t );iopaddr_t xtalk_dmatrans_addr (vertex_hdl_t ,device_desc_t ,paddr_t ,size_t ,unsigned ); -alenlist_t xtalk_dmatrans_list (vertex_hdl_t ,device_desc_t ,alenlist_t ,unsigned );void xtalk_dmamap_drain (xtalk_dmamap_t );void xtalk_dmaaddr_drain (vertex_hdl_t ,iopaddr_t ,size_t ); -void xtalk_dmalist_drain (vertex_hdl_t ,alenlist_t );xtalk_intr_t xtalk_intr_alloc (vertex_hdl_t ,device_desc_t ,vertex_hdl_t );xtalk_intr_t xtalk_intr_alloc_nothd (vertex_hdl_t ,device_desc_t ,vertex_hdl_t );void xtalk_intr_free (xtalk_intr_t );
@@ -352,16 +349,6 @@ } -alenlist_t -xtalk_dmamap_list (xtalk_dmamap_t xtalk_dmamap,/* use these mapping resources */ -alenlist_t alenlist,/* map this Address/Length List */ -unsigned flags) -{ -return DMAMAP_FUNC (xtalk_dmamap, dmamap_list) - (CAST_DMAMAP (xtalk_dmamap), alenlist, flags); -} - -void xtalk_dmamap_done (xtalk_dmamap_t xtalk_dmamap) {
@@ -382,16 +369,6 @@ } -alenlist_t -xtalk_dmatrans_list (vertex_hdl_t dev,/* translate for this device */ -device_desc_t dev_desc,/* device descriptor */ -alenlist_t palenlist,/* system address/length list */ -unsigned flags) -{/* defined in dma.h */ -return DEV_FUNC (dev, dmatrans_list) - (dev, dev_desc, palenlist, flags); -} -void xtalk_dmamap_drain (xtalk_dmamap_t map) {
@@ -406,13 +383,6 @@ (dev, addr, size); } -void -xtalk_dmalist_drain (vertex_hdl_t dev,alenlist_t list) -{ -DEV_FUNC (dev, dmalist_drain) - (dev, list); -} -/* ===================================================================== * INTERRUPT MANAGEMENT *
include/asm-ia64/sn/alenlist.h +0 -204
204 lines not on this page · raw message
include/asm-ia64/sn/pci/pcibr.h +0 -12
@@ -119,10 +119,6 @@paddr_t paddr, size_t byte_count); -extern alenlist_t pcibr_dmamap_list (pcibr_dmamap_t dmamap, -alenlist_t palenlist, -unsigned flags); -extern void pcibr_dmamap_done (pcibr_dmamap_t dmamap);/*
@@ -139,20 +135,12 @@size_t byte_count, unsigned flags); -extern alenlist_t pcibr_dmatrans_list (vertex_hdl_t dev, -device_desc_t dev_desc, -alenlist_t palenlist, -unsigned flags); -extern void pcibr_dmamap_drain (pcibr_dmamap_t map);extern void pcibr_dmaaddr_drain (vertex_hdl_t vhdl,paddr_t addr,size_t bytes); -extern void pcibr_dmalist_drain (vertex_hdl_t vhdl, -alenlist_t list); -typedef unsigned pcibr_intr_ibit_f (pciio_info_t info,pciio_intr_line_t lines);
include/asm-ia64/sn/pci/pciio.h +0 -12
@@ -28,10 +28,8 @@#ifdef __KERNEL__#include <asm/sn/dmamap.h> -#include <asm/sn/alenlist.h> #else #include <dmamap.h> -#include <alenlist.h> #endif typedef int pciio_vendor_id_t ;
@@ -99,10 +97,6 @@* sleep waiting for resoruces, return an error * instead. (PIOMAP_NOSLEEP and DMAMAP_NOSLEEP are * the same numeric value and are acceptable). -* PCIIO_INPLACE: when operating on alenlist structures, -* reuse the source alenlist rather than creating a -* new one. (PIOMAP_INPLACE and DMAMAP_INPLACE are -* the same numeric value and are acceptable). * * PCIIO_DMA_CMD: configure this stream as a * generic "command" stream. Generally this
@@ -162,7 +156,6 @@#define PCIIO_FIXED DMAMAP_FIXED#define PCIIO_NOSLEEP DMAMAP_NOSLEEP -#define PCIIO_INPLACE DMAMAP_INPLACE#define PCIIO_DMA_CMD 0x0010#define PCIIO_DMA_DATA 0x0020
@@ -398,9 +391,6 @@paddr_t addr, size_t bytes); -typedef void -pciio_dmalist_drain_f (vertex_hdl_t vhdl, -alenlist_t list);/* INTERRUPT MANAGEMENT */
@@ -494,7 +484,6 @@pciio_dmatrans_addr_f *dmatrans_addr;pciio_dmamap_drain_f *dmamap_drain;pciio_dmaaddr_drain_f *dmaaddr_drain; -pciio_dmalist_drain_f *dmalist_drain;/* INTERRUPT MANAGEMENT */ pciio_intr_alloc_f *intr_alloc;
@@ -536,7 +525,6 @@extern pciio_dmatrans_addr_f pciio_dmatrans_addr;extern pciio_dmamap_drain_f pciio_dmamap_drain;extern pciio_dmaaddr_drain_f pciio_dmaaddr_drain; -extern pciio_dmalist_drain_f pciio_dmalist_drain;extern pciio_intr_alloc_f pciio_intr_alloc;extern pciio_intr_free_f pciio_intr_free;extern pciio_intr_connect_f pciio_intr_connect;
include/asm-ia64/sn/sn2/shubio.h +0 -16
@@ -3385,7 +3385,6 @@#define IO_PERF_SETS 32#if __KERNEL__ -#include <asm/sn/alenlist.h> #include <asm/sn/dmamap.h> #include <asm/sn/driver.h> #include <asm/sn/xtalk/xtalk.h>
@@ -3530,11 +3529,6 @@paddr_t paddr,/* map for this address */ size_t byte_count); /* map this many bytes */ -extern alenlist_t -hub_dmamap_list (hub_dmamap_t dmamap,/* use mapping resources */ -alenlist_t alenlist,/* map this Addr/Length List */ -unsigned flags); -extern void hub_dmamap_done (hub_dmamap_t dmamap);/* done w/ mapping resources */
@@ -3545,12 +3539,6 @@size_t byte_count,/* length */ unsigned flags); /* defined in dma.h */ -extern alenlist_t -hub_dmatrans_list (vertex_hdl_t dev,/* translate for this device */ -device_desc_t dev_desc,/* device descriptor */ -alenlist_t palenlist,/* system addr/length list */ -unsigned flags);/* defined in dma.h */ -extern void hub_dmamap_drain (hub_dmamap_t map);
@@ -3559,10 +3547,6 @@paddr_t addr, size_t bytes); -extern void -hub_dmalist_drain (vertex_hdl_t vhdl, -alenlist_t list); -/* INTERRUPT MANAGEMENT */ typedef struct hub_intr_s *hub_intr_t ;
include/asm-ia64/sn/xtalk/xtalk.h +0 -28
@@ -59,7 +59,6 @@#include <asm/types.h> #include <asm/sn/types.h> -#include <asm/sn/alenlist.h> #include <asm/sn/ioerror.h> #include <asm/sn/driver.h> #include <asm/sn/dmamap.h>
@@ -78,14 +77,9 @@* sleep waiting for resoruces, return an error * instead. (PIOMAP_NOSLEEP and DMAMAP_NOSLEEP are * the same numeric value and are acceptable). -* XTALK_INPLACE: when operating on alenlist structures, -* reuse the source alenlist rather than creating a -* new one. (PIOMAP_INPLACE and DMAMAP_INPLACE are -* the same numeric value and are acceptable). */ #define XTALK_FIXED DMAMAP_FIXED#define XTALK_NOSLEEP DMAMAP_NOSLEEP -#define XTALK_INPLACE DMAMAP_INPLACE/* PIO MANAGEMENT */ typedef xtalk_piomap_t
@@ -139,11 +133,6 @@paddr_t paddr,/* map for this address */ size_t byte_count); /* map this many bytes */ -typedef alenlist_t -xtalk_dmamap_list_f (xtalk_dmamap_t dmamap,/* use these mapping resources */ -alenlist_t alenlist,/* map this address/length list */ -unsigned int flags); -typedef void xtalk_dmamap_done_f (xtalk_dmamap_t dmamap);
@@ -154,12 +143,6 @@size_t byte_count,/* length */ unsigned int flags); -typedef alenlist_t -xtalk_dmatrans_list_f (vertex_hdl_t dev,/* translate for this device */ -device_desc_t dev_desc,/* device descriptor */ -alenlist_t palenlist,/* system address/length list */ -unsigned int flags); -typedef void xtalk_dmamap_drain_f (xtalk_dmamap_t map);/* drain this map's channel */
@@ -168,11 +151,6 @@paddr_t addr,/* to this physical address */ size_t bytes); /* for this many bytes */ -typedef void -xtalk_dmalist_drain_f (vertex_hdl_t vhdl,/* drain channel from this device */ -alenlist_t list);/* for this set of physical blocks */ - -/* INTERRUPT MANAGEMENT */ /*
@@ -260,13 +238,10 @@xtalk_dmamap_alloc_f *dmamap_alloc;xtalk_dmamap_free_f *dmamap_free;xtalk_dmamap_addr_f *dmamap_addr; -xtalk_dmamap_list_f *dmamap_list;xtalk_dmamap_done_f *dmamap_done;xtalk_dmatrans_addr_f *dmatrans_addr; -xtalk_dmatrans_list_f *dmatrans_list;xtalk_dmamap_drain_f *dmamap_drain;xtalk_dmaaddr_drain_f *dmaaddr_drain; -xtalk_dmalist_drain_f *dmalist_drain;/* INTERRUPT MANAGEMENT */ xtalk_intr_alloc_f *intr_alloc;
@@ -289,13 +264,10 @@extern xtalk_dmamap_alloc_f xtalk_dmamap_alloc;extern xtalk_dmamap_free_f xtalk_dmamap_free;extern xtalk_dmamap_addr_f xtalk_dmamap_addr; -extern xtalk_dmamap_list_f xtalk_dmamap_list;extern xtalk_dmamap_done_f xtalk_dmamap_done;extern xtalk_dmatrans_addr_f xtalk_dmatrans_addr; -extern xtalk_dmatrans_list_f xtalk_dmatrans_list;extern xtalk_dmamap_drain_f xtalk_dmamap_drain;extern xtalk_dmaaddr_drain_f xtalk_dmaaddr_drain; -extern xtalk_dmalist_drain_f xtalk_dmalist_drain;extern xtalk_intr_alloc_f xtalk_intr_alloc;extern xtalk_intr_alloc_f xtalk_intr_alloc_nothd;extern xtalk_intr_free_f xtalk_intr_free;