From 8e4eef225c3e5fc70c1656822dd40cb17ee9d2f6 Mon Sep 17 00:00:00 2001 From: Daniel Scheller Date: Sun, 20 Aug 2017 06:41:10 -0400 Subject: media: ddbridge: move ddb_unmap(), cleanup modparams adapter_alloc is only used from within ddbridge-core, so move it there, this removes the need for prototyping/referencing the variable. While at it, msi isn't needed outside of ddbridge-main, so don't extref that one aswell. Signed-off-by: Daniel Scheller Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/ddbridge/ddbridge-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'drivers/media/pci/ddbridge/ddbridge-core.c') diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index c80e1d8498d3..5f6367fee586 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -58,10 +58,21 @@ #define DDB_MAX_ADAPTER 64 +/****************************************************************************/ + DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); +static int adapter_alloc; +module_param(adapter_alloc, int, 0444); +MODULE_PARM_DESC(adapter_alloc, + "0-one adapter per io, 1-one per tab with io, 2-one per tab, 3-one for all"); + +/****************************************************************************/ + DEFINE_MUTEX(redirect_lock); +struct workqueue_struct *ddb_wq; + static struct ddb *ddbs[DDB_MAX_ADAPTER]; /****************************************************************************/ @@ -3612,3 +3623,10 @@ fail: dev_err(dev->dev, "fail1\n"); return -1; } + +void ddb_unmap(struct ddb *dev) +{ + if (dev->regs) + iounmap(dev->regs); + vfree(dev); +} -- cgit