[dahdi-commits] fjoe: freebsd/trunk r8711 - in /freebsd/trunk/drivers/dahdi: ./ voicebus/ wcb...
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Sat May 29 03:27:21 CDT 2010
Author: fjoe
Date: Sat May 29 03:27:19 2010
New Revision: 8711
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8711
Log:
- Remove unused shutdown/suspend/resume device methods
- Remove unused DPRINTF macros
- Fix xxx_setup_intr error return values (should be > 0)
Modified:
freebsd/trunk/drivers/dahdi/dahdi-base.c
freebsd/trunk/drivers/dahdi/voicebus/voicebus.c
freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
freebsd/trunk/drivers/dahdi/wcfxo.c
freebsd/trunk/drivers/dahdi/wct4xxp/base.c
freebsd/trunk/drivers/dahdi/wctdm.c
freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
freebsd/trunk/drivers/dahdi/wcte11xp.c
Modified: freebsd/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi-base.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi-base.c Sat May 29 03:27:19 2010
@@ -143,8 +143,6 @@
} ;
#if defined(__FreeBSD__)
-#define DPRINTF(fmt, args...) rlprintf(10, "%s: " fmt, __FUNCTION__, ##args)
-
MALLOC_DEFINE(M_DAHDI, "dahdi", "DAHDI interface data structures");
/*
Modified: freebsd/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ freebsd/trunk/drivers/dahdi/voicebus/voicebus.c Sat May 29 03:27:19 2010
@@ -43,8 +43,6 @@
#include <dev/pci/pcivar.h>
#include <machine/resource.h>
-
-#define DPRINTF(dev, fmt, args...) device_rlprintf(20, *dev, fmt, ##args)
/* XXX do not defer processing to tasklet yet */
/*#define CONFIG_VOICEBUS_NODEFER*/
@@ -141,13 +139,13 @@
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
size, 1, size, BUS_DMA_ALLOCNOW, NULL, NULL, ptag);
if (res)
- return res;
+ return (res);
res = bus_dmamem_alloc(*ptag, pvaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, pmap);
if (res) {
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
+ return (res);
}
res = bus_dmamap_load(*ptag, *pmap, *pvaddr, size, vb_dma_map_addr, ppaddr, 0);
@@ -160,10 +158,10 @@
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
- }
-
- return 0;
+ return (res);
+ }
+
+ return (0);
}
static void
Modified: freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcb4xxp/base.c Sat May 29 03:27:19 2010
@@ -43,8 +43,6 @@
#define wmb()
#define mmiowb()
-
-#define DPRINTF(dev, fmt, args...) device_rlprintf(10, dev, fmt, ##args)
#else /* !__FreeBSD__ */
#include <linux/autoconf.h>
#include <linux/init.h>
@@ -3000,7 +2998,7 @@
b4->pdev->dev, SYS_RES_IRQ, &b4->irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (b4->irq_res == NULL) {
device_printf(b4->pdev->dev, "Can't allocate irq resource\n");
- return -ENXIO;
+ return (-ENXIO);
}
error = bus_setup_intr(
@@ -3008,7 +3006,7 @@
b4, &b4->irq_handle);
if (error) {
device_printf(b4->pdev->dev, "Can't setup interrupt handler (error %d)\n", error);
- return -ENXIO;
+ return (-ENXIO);
}
return (0);
@@ -3022,7 +3020,7 @@
id = dahdi_pci_device_id_lookup(dev, b4xx_ids);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
/* found device */
device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
@@ -3042,7 +3040,7 @@
id = dahdi_pci_device_id_lookup(dev, b4xx_ids);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
dt = (struct devtype *) id->driver_data;
b4 = device_get_softc(dev);
@@ -3056,7 +3054,7 @@
if (b4->io_res == NULL) {
device_printf(dev, "Can't allocate I/O resource\n");
b4xxp_release_resources(b4);
- return ENXIO;
+ return (ENXIO);
}
/* allocate memory resource */
@@ -3065,17 +3063,17 @@
if (b4->mem_res == NULL) {
device_printf(dev, "Can't allocate memory resource\n");
b4xxp_release_resources(b4);
- return ENXIO;
+ return (ENXIO);
}
/* register */
res = b4xxp_register(b4, dt);
if (res) {
b4xxp_release_resources(b4);
- return -res;
- }
-
- return 0;
+ return (-res);
+ }
+
+ return (0);
}
static int
@@ -3089,27 +3087,6 @@
/* release resources */
b4xxp_release_resources(b4);
- return (0);
-}
-
-static int
-b4xxp_device_shutdown(device_t dev)
-{
- DPRINTF(dev, "%s shutdown\n", device_get_name(dev));
- return (0);
-}
-
-static int
-b4xxp_device_suspend(device_t dev)
-{
- DPRINTF(dev, "%s suspend\n", device_get_name(dev));
- return (0);
-}
-
-static int
-b4xxp_device_resume(device_t dev)
-{
- DPRINTF(dev, "%s resume\n", device_get_name(dev));
return (0);
}
@@ -3117,9 +3094,6 @@
DEVMETHOD(device_probe, b4xxp_device_probe),
DEVMETHOD(device_attach, b4xxp_device_attach),
DEVMETHOD(device_detach, b4xxp_device_detach),
- DEVMETHOD(device_shutdown, b4xxp_device_shutdown),
- DEVMETHOD(device_suspend, b4xxp_device_suspend),
- DEVMETHOD(device_resume, b4xxp_device_resume),
{ 0, 0 }
};
Modified: freebsd/trunk/drivers/dahdi/wcfxo.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcfxo.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcfxo.c (original)
+++ freebsd/trunk/drivers/dahdi/wcfxo.c Sat May 29 03:27:19 2010
@@ -32,8 +32,6 @@
#include <machine/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-
-#define DPRINTF(dev, fmt, args...) device_rlprintf(20, dev, fmt, ##args)
#define set_current_state(x)
#else /* !__FreeBSD__ */
@@ -1190,7 +1188,7 @@
wc->dev->dev, SYS_RES_IRQ, &wc->irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (wc->irq_res == NULL) {
device_printf(wc->dev->dev, "Can't allocate irq resource\n");
- return -ENXIO;
+ return (ENXIO);
}
error = bus_setup_intr(
@@ -1198,7 +1196,7 @@
wcfxo_interrupt, NULL, wc, &wc->irq_handle);
if (error) {
device_printf(wc->dev->dev, "Can't setup interrupt handler (error %d)\n", error);
- return -ENXIO;
+ return (ENXIO);
}
return (0);
@@ -1220,13 +1218,13 @@
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
size, 1, size, BUS_DMA_ALLOCNOW, NULL, NULL, ptag);
if (res)
- return res;
+ return (res);
res = bus_dmamem_alloc(*ptag, pvaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, pmap);
if (res) {
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
+ return (res);
}
res = bus_dmamap_load(*ptag, *pmap, *pvaddr, size, wcfxo_dma_map_addr, ppaddr, 0);
@@ -1239,10 +1237,10 @@
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
- }
-
- return 0;
+ return (res);
+ }
+
+ return (0);
}
static void
@@ -1273,10 +1271,10 @@
id = dahdi_pci_device_id_lookup(dev, wcfxo_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
if (wcfxo_validate_params())
- return ENXIO;
+ return (ENXIO);
/* found device */
device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
@@ -1296,7 +1294,7 @@
id = dahdi_pci_device_id_lookup(dev, wcfxo_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
d = (struct wcfxo_desc *) id->driver_data;
wc = device_get_softc(dev);
@@ -1312,7 +1310,7 @@
wc->io_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &wc->io_rid, RF_ACTIVE);
if (wc->io_res == NULL) {
device_printf(dev, "Can't allocate IO resource\n");
- return ENXIO;
+ return (ENXIO);
}
/* enable bus mastering */
@@ -1355,7 +1353,7 @@
}
wcfxo_set_daa_mode(wc);
printk(KERN_INFO "Found a Wildcard FXO: %s\n", wc->variety);
- return 0;
+ return (0);
err:
if (test_bit(DAHDI_FLAGBIT_REGISTERED, &wc->span.flags))
@@ -1369,7 +1367,7 @@
/* release resources */
wcfxo_release_resources(wc);
- return res;
+ return (res);
}
static int
@@ -1393,27 +1391,6 @@
/* Release resources */
wcfxo_release_resources(wc);
- return (0);
-}
-
-static int
-wcfxo_device_shutdown(device_t dev)
-{
- DPRINTF(dev, "%s shutdown\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wcfxo_device_suspend(device_t dev)
-{
- DPRINTF(dev, "%s suspend\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wcfxo_device_resume(device_t dev)
-{
- DPRINTF(dev, "%s resume\n", device_get_name(dev));
return (0);
}
@@ -1421,9 +1398,6 @@
DEVMETHOD(device_probe, wcfxo_device_probe),
DEVMETHOD(device_attach, wcfxo_device_attach),
DEVMETHOD(device_detach, wcfxo_device_detach),
- DEVMETHOD(device_shutdown, wcfxo_device_shutdown),
- DEVMETHOD(device_suspend, wcfxo_device_suspend),
- DEVMETHOD(device_resume, wcfxo_device_resume),
{ 0, 0 }
};
Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Sat May 29 03:27:19 2010
@@ -38,8 +38,6 @@
#include <machine/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-
-#define DPRINTF(dev, fmt, args...) device_rlprintf(20, dev, fmt, ##args)
static int
t4_dma_allocate(int size, bus_dma_tag_t *ptag, bus_dmamap_t *pmap, void **pvaddr, uint32_t *ppaddr);
@@ -4634,13 +4632,13 @@
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
size, 1, size, BUS_DMA_ALLOCNOW, NULL, NULL, ptag);
if (res)
- return res;
+ return (res);
res = bus_dmamem_alloc(*ptag, pvaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, pmap);
if (res) {
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
+ return (res);
}
res = bus_dmamap_load(*ptag, *pmap, *pvaddr, size, t4_dma_map_addr, ppaddr, 0);
@@ -4653,10 +4651,10 @@
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
- }
-
- return 0;
+ return (res);
+ }
+
+ return (0);
}
static void
@@ -4687,7 +4685,7 @@
id = dahdi_pci_device_id_lookup(dev, t4_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
/* found device */
device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
@@ -4707,7 +4705,7 @@
id = dahdi_pci_device_id_lookup(dev, t4_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
dt = (struct devtype *) id->driver_data;
wc = device_get_softc(dev);
@@ -4719,7 +4717,7 @@
wc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &wc->mem_rid, RF_ACTIVE);
if (wc->mem_res == NULL) {
device_printf(dev, "Can't allocate memory resource\n");
- return ENXIO;
+ return (ENXIO);
}
/* enable bus mastering */
@@ -4729,12 +4727,12 @@
res = t4_register(wc, dt, (dt->flags & FLAG_2PORT) ? 2 : 4);
if (res) {
t4_release_resources(wc);
- return -res;
+ return (-res);
}
/* launch card */
t4_launch(wc);
- return 0;
+ return (0);
}
static int
@@ -4749,27 +4747,6 @@
t4_release_resources(wc);
free_wc(wc);
- return (0);
-}
-
-static int
-t4_device_shutdown(device_t dev)
-{
- DPRINTF(dev, "%s shutdown\n", device_get_name(dev));
- return (0);
-}
-
-static int
-t4_device_suspend(device_t dev)
-{
- DPRINTF(dev, "%s suspend\n", device_get_name(dev));
- return (0);
-}
-
-static int
-t4_device_resume(device_t dev)
-{
- DPRINTF(dev, "%s resume\n", device_get_name(dev));
return (0);
}
@@ -4777,9 +4754,6 @@
DEVMETHOD(device_probe, t4_device_probe),
DEVMETHOD(device_attach, t4_device_attach),
DEVMETHOD(device_detach, t4_device_detach),
- DEVMETHOD(device_shutdown, t4_device_shutdown),
- DEVMETHOD(device_suspend, t4_device_suspend),
- DEVMETHOD(device_resume, t4_device_resume),
{ 0, 0 }
};
Modified: freebsd/trunk/drivers/dahdi/wctdm.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctdm.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctdm.c (original)
+++ freebsd/trunk/drivers/dahdi/wctdm.c Sat May 29 03:27:19 2010
@@ -32,8 +32,6 @@
#include <machine/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-
-#define DPRINTF(dev, fmt, args...) device_rlprintf(20, dev, fmt, ##args)
#define set_current_state(x)
#else /* !__FreeBSD__ */
@@ -2927,7 +2925,7 @@
wc->dev->dev, SYS_RES_IRQ, &wc->irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (wc->irq_res == NULL) {
device_printf(wc->dev->dev, "Can't allocate irq resource\n");
- return -ENXIO;
+ return (ENXIO);
}
error = bus_setup_intr(
@@ -2935,7 +2933,7 @@
wctdm_interrupt, NULL, wc, &wc->irq_handle);
if (error) {
device_printf(wc->dev->dev, "Can't setup interrupt handler (error %d)\n", error);
- return -ENXIO;
+ return (ENXIO);
}
return (0);
@@ -2957,13 +2955,13 @@
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
size, 1, size, BUS_DMA_ALLOCNOW, NULL, NULL, ptag);
if (res)
- return res;
+ return (res);
res = bus_dmamem_alloc(*ptag, pvaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, pmap);
if (res) {
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
+ return (res);
}
res = bus_dmamap_load(*ptag, *pmap, *pvaddr, size, wctdm_dma_map_addr, ppaddr, 0);
@@ -2976,10 +2974,10 @@
bus_dma_tag_destroy(*ptag);
*ptag = NULL;
- return res;
- }
-
- return 0;
+ return (res);
+ }
+
+ return (0);
}
static void
@@ -3010,10 +3008,10 @@
id = dahdi_pci_device_id_lookup(dev, wctdm_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
if (wctdm_validate_params())
- return ENXIO;
+ return (ENXIO);
/* found device */
device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
@@ -3034,7 +3032,7 @@
id = dahdi_pci_device_id_lookup(dev, wctdm_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
d = (struct wctdm_desc *) id->driver_data;
wc = device_get_softc(dev);
@@ -3055,7 +3053,7 @@
wc->io_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &wc->io_rid, RF_ACTIVE);
if (wc->io_res == NULL) {
device_printf(dev, "Can't allocate IO resource\n");
- return ENXIO;
+ return (ENXIO);
}
/* enable bus mastering */
@@ -3104,7 +3102,7 @@
}
printk(KERN_INFO "Found a Wildcard TDM: %s (%d modules)\n", wc->variety, cardcount);
- return 0;
+ return (0);
err:
/* Set Reset Low */
@@ -3117,7 +3115,7 @@
/* release resources */
wctdm_release_resources(wc);
- return res;
+ return (res);
}
static int
@@ -3142,27 +3140,6 @@
wctdm_release_resources(wc);
spin_lock_destroy(&wc->lock);
- return (0);
-}
-
-static int
-wctdm_device_shutdown(device_t dev)
-{
- DPRINTF(dev, "%s shutdown\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wctdm_device_suspend(device_t dev)
-{
- DPRINTF(dev, "%s suspend\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wctdm_device_resume(device_t dev)
-{
- DPRINTF(dev, "%s resume\n", device_get_name(dev));
return (0);
}
@@ -3170,9 +3147,6 @@
DEVMETHOD(device_probe, wctdm_device_probe),
DEVMETHOD(device_attach, wctdm_device_attach),
DEVMETHOD(device_detach, wctdm_device_detach),
- DEVMETHOD(device_shutdown, wctdm_device_shutdown),
- DEVMETHOD(device_suspend, wctdm_device_suspend),
- DEVMETHOD(device_resume, wctdm_device_resume),
{ 0, 0 }
};
Modified: freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c Sat May 29 03:27:19 2010
@@ -49,7 +49,6 @@
#define fatal_signal_pending(c) 0
-#define DPRINTF(dev, fmt, args...) device_rlprintf(20, dev, fmt, ##args)
#else /* !__FreeBSD__ */
#include <linux/version.h>
#include <linux/kernel.h>
@@ -5141,7 +5140,7 @@
id = dahdi_pci_device_id_lookup(dev, wctdm_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
/* found device */
device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
@@ -5159,7 +5158,7 @@
id = dahdi_pci_device_id_lookup(dev, wctdm_pci_tbl);
if (id == NULL)
- return ENXIO;
+ return (ENXIO);
res = wctdm_init_one(dev, id);
return -res;
@@ -5172,26 +5171,6 @@
return (0);
}
-static int
-wctdm_device_shutdown(device_t dev)
-{
- DPRINTF(dev, "%s shutdown\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wctdm_device_suspend(device_t dev)
-{
- DPRINTF(dev, "%s suspend\n", device_get_name(dev));
- return (0);
-}
-
-static int
-wctdm_device_resume(device_t dev)
-{
- DPRINTF(dev, "%s resume\n", device_get_name(dev));
- return (0);
-}
static int
wctdm_modevent(module_t mod __unused, int type, void *data __unused)
@@ -5206,7 +5185,7 @@
wctdm_cleanup();
return 0;
default:
- return EOPNOTSUPP;
+ return (EOPNOTSUPP);
}
}
@@ -5214,9 +5193,6 @@
DEVMETHOD(device_probe, wctdm_device_probe),
DEVMETHOD(device_attach, wctdm_device_attach),
DEVMETHOD(device_detach, wctdm_device_detach),
- DEVMETHOD(device_shutdown, wctdm_device_shutdown),
- DEVMETHOD(device_suspend, wctdm_device_suspend),
- DEVMETHOD(device_resume, wctdm_device_resume),
{ 0, 0 }
};
Modified: freebsd/trunk/drivers/dahdi/wcte11xp.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcte11xp.c?view=diff&rev=8711&r1=8710&r2=8711
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcte11xp.c (original)
+++ freebsd/trunk/drivers/dahdi/wcte11xp.c Sat May 29 03:27:19 2010
@@ -1705,7 +1705,7 @@
wc->dev->dev, SYS_RES_IRQ, &wc->irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (wc->irq_res == NULL) {
device_printf(wc->dev->dev, "Can't allocate irq resource\n");
- return -ENXIO;
+ return (ENXIO);
}
error = bus_setup_intr(
@@ -1713,7 +1713,7 @@
t1xxp_interrupt, NULL, wc, &wc->irq_handle);
if (error) {
device_printf(wc->dev->dev, "Can't setup interrupt handler (error %d)\n", error);
- return -ENXIO;
+ return (ENXIO);
}
return (0);
More information about the dahdi-commits
mailing list