The patch number 8964 was added via Janne Grunau <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Janne Grunau <[EMAIL PROTECTED]>
dvb/budget: push adapter_nr mod option down to individual drivers
adapter_nr mod option does not make sense for budget-core since it is only
common code shared by all budget drivers
Priority: normal
Signed-off-by: Janne Grunau <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/ttpci/budget-av.c | 6 +++++-
linux/drivers/media/dvb/ttpci/budget-ci.c | 5 ++++-
linux/drivers/media/dvb/ttpci/budget-core.c | 6 ++----
linux/drivers/media/dvb/ttpci/budget-patch.c | 7 +++++--
linux/drivers/media/dvb/ttpci/budget.c | 5 ++++-
linux/drivers/media/dvb/ttpci/budget.h | 2 +-
6 files changed, 21 insertions(+), 10 deletions(-)
diff -r e5ca4534b543 -r d9248e8255c2 linux/drivers/media/dvb/ttpci/budget-av.c
--- a/linux/drivers/media/dvb/ttpci/budget-av.c Tue Sep 09 08:29:56 2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c Mon Sep 22 01:50:11 2008 +0200
@@ -56,6 +56,8 @@
#define SLOTSTATUS_RESET 4
#define SLOTSTATUS_READY 8
#define SLOTSTATUS_OCCUPIED
(SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
struct budget_av {
struct budget budget;
@@ -1127,7 +1129,9 @@ static int budget_av_attach(struct saa71
dev->ext_priv = budget_av;
- if ((err = ttpci_budget_init(&budget_av->budget, dev, info,
THIS_MODULE))) {
+ err = ttpci_budget_init(&budget_av->budget, dev, info, THIS_MODULE,
+ adapter_nr);
+ if (err) {
kfree(budget_av);
return err;
}
diff -r e5ca4534b543 -r d9248e8255c2 linux/drivers/media/dvb/ttpci/budget-ci.c
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c Tue Sep 09 08:29:56 2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c Mon Sep 22 01:50:11 2008 +0200
@@ -95,6 +95,8 @@ static int ir_debug;
static int ir_debug;
module_param(ir_debug, int, 0644);
MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
struct budget_ci_ir {
struct input_dev *dev;
@@ -1191,7 +1193,8 @@ static int budget_ci_attach(struct saa71
dev->ext_priv = budget_ci;
- err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);
+ err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE,
+ adapter_nr);
if (err)
goto out2;
diff -r e5ca4534b543 -r d9248e8255c2 linux/drivers/media/dvb/ttpci/budget-core.c
--- a/linux/drivers/media/dvb/ttpci/budget-core.c Tue Sep 09 08:29:56
2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget-core.c Mon Sep 22 01:50:11
2008 +0200
@@ -56,8 +56,6 @@ module_param_named(bufsize, dma_buffer_s
module_param_named(bufsize, dma_buffer_size, int, 0444);
MODULE_PARM_DESC(debug, "Turn on/off budget debugging (default:off).");
MODULE_PARM_DESC(bufsize, "DMA buffer size in KB, default: 188, min: 188, max:
1410 (Activy: 564)");
-
-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
/****************************************************************************
* TT budget / WinTV Nova
@@ -411,7 +409,7 @@ static void budget_unregister(struct bud
int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
struct saa7146_pci_extension_data *info,
- struct module *owner)
+ struct module *owner, short *adapter_nums)
{
int ret = 0;
struct budget_info *bi = info->ext_priv;
@@ -474,7 +472,7 @@ int ttpci_budget_init(struct budget *bud
printk("%s: dma buffer size %u\n", budget->dev->name,
budget->buffer_size);
ret = dvb_register_adapter(&budget->dvb_adapter, budget->card->name,
- owner, &budget->dev->pci->dev, adapter_nr);
+ owner, &budget->dev->pci->dev, adapter_nums);
if (ret < 0)
return ret;
diff -r e5ca4534b543 -r d9248e8255c2
linux/drivers/media/dvb/ttpci/budget-patch.c
--- a/linux/drivers/media/dvb/ttpci/budget-patch.c Tue Sep 09 08:29:56
2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget-patch.c Mon Sep 22 01:50:11
2008 +0200
@@ -38,6 +38,8 @@
#include "tda8083.h"
#include "bsru6.h"
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
#define budget_patch budget
@@ -592,8 +594,9 @@ static int budget_patch_attach (struct s
dprintk(2, "budget: %p\n", budget);
- if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
- kfree (budget);
+ err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);
+ if (err) {
+ kfree(budget);
return err;
}
diff -r e5ca4534b543 -r d9248e8255c2 linux/drivers/media/dvb/ttpci/budget.c
--- a/linux/drivers/media/dvb/ttpci/budget.c Tue Sep 09 08:29:56 2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget.c Mon Sep 22 01:50:11 2008 +0200
@@ -51,6 +51,8 @@ static int diseqc_method;
static int diseqc_method;
module_param(diseqc_method, int, 0444);
MODULE_PARM_DESC(diseqc_method, "Select DiSEqC method for subsystem id
13c2:1003, 0: default, 1: more reliable (for newer revisions only)");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
static void Set22K (struct budget *budget, int state)
{
@@ -598,7 +600,8 @@ static int budget_attach (struct saa7146
dev->ext_priv = budget;
- if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+ err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);
+ if (err) {
printk("==> failed\n");
kfree (budget);
return err;
diff -r e5ca4534b543 -r d9248e8255c2 linux/drivers/media/dvb/ttpci/budget.h
--- a/linux/drivers/media/dvb/ttpci/budget.h Tue Sep 09 08:29:56 2008 -0700
+++ b/linux/drivers/media/dvb/ttpci/budget.h Mon Sep 22 01:50:11 2008 +0200
@@ -110,7 +110,7 @@ static struct saa7146_pci_extension_data
extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
struct saa7146_pci_extension_data *info,
- struct module *owner);
+ struct module *owner, short *adapter_nums);
extern void ttpci_budget_init_hooks(struct budget *budget);
extern int ttpci_budget_deinit(struct budget *budget);
extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d9248e8255c26dcbf3d88a325a0077fb1c7d08d1
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
