Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26dc4d04 authored by Janne Grunau's avatar Janne Grunau Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8964): 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

Signed-off-by: default avatarJanne Grunau <janne-dvb@grunau.be>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8ca4dae3

drivers/media/dvb/ttpci/budget-av.c

+5 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
#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;

	struct video_device *vd;
@@ -1127,7 +1129,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 


	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;

	}

drivers/media/dvb/ttpci/budget-ci.c

+4 −1
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ 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;

	struct tasklet_struct msp430_irq_tasklet;
@@ -1183,7 +1185,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 


	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;

drivers/media/dvb/ttpci/budget-core.c

+2 −4
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 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 budget *budget) 


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 *budget, struct saa7146_dev *dev, 
	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;

drivers/media/dvb/ttpci/budget-patch.c

+5 −2
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


#include "bsru6.h"



DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);



#define budget_patch budget



static struct saa7146_extension budget_extension;
@@ -592,7 +594,8 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte 


	dprintk(2, "budget: %p\n", budget);



	if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {

	err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);

	if (err) {

		kfree(budget);

		return err;

	}

drivers/media/dvb/ttpci/budget.c

+4 −1
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 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)

{

	struct saa7146_dev *dev=budget->dev;
@@ -598,7 +600,8 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_ 


	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;