diff options
author | Daniel Scheller <d.scheller@gmx.net> | 2017-08-20 12:41:10 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-08-20 13:40:53 +0200 |
commit | 8e4eef225c3e5fc70c1656822dd40cb17ee9d2f6 (patch) | |
tree | 968a2fe79877bc303ac1b1f5e2928d23c5b6f9a2 /drivers/media/pci/ddbridge/ddbridge-main.c | |
parent | media: ddbridge: move device ID table to ddbridge-hw (diff) | |
download | linux-8e4eef225c3e5fc70c1656822dd40cb17ee9d2f6.tar.xz linux-8e4eef225c3e5fc70c1656822dd40cb17ee9d2f6.zip |
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 <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/ddbridge/ddbridge-main.c')
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-main.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-main.c b/drivers/media/pci/ddbridge/ddbridge-main.c index ec608c496b69..ccac7fe31336 100644 --- a/drivers/media/pci/ddbridge/ddbridge-main.c +++ b/drivers/media/pci/ddbridge/ddbridge-main.c @@ -41,16 +41,11 @@ /****************************************************************************/ /* module parameters */ -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"); - #ifdef CONFIG_PCI_MSI #ifdef CONFIG_DVB_DDBRIDGE_MSIENABLE -int msi = 1; +static int msi = 1; #else -int msi; +static int msi; #endif module_param(msi, int, 0444); #ifdef CONFIG_DVB_DDBRIDGE_MSIENABLE @@ -89,20 +84,9 @@ module_param(stv0910_single, int, 0444); MODULE_PARM_DESC(stv0910_single, "use stv0910 cards as single demods"); /****************************************************************************/ - -struct workqueue_struct *ddb_wq; - -/****************************************************************************/ /****************************************************************************/ /****************************************************************************/ -static void ddb_unmap(struct ddb *dev) -{ - if (dev->regs) - iounmap(dev->regs); - vfree(dev); -} - static void ddb_irq_disable(struct ddb *dev) { ddbwritel(dev, 0, INTERRUPT_ENABLE); |