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

Commit 9eeebd22 authored by Tomas Winkler's avatar Tomas Winkler Committed by Pierre Ossman
Browse files

mmc: wbsd.c fix shadowing of 'dma' variable 



This patch fix warning :shadowing dma variable
and made use of module_param_named instead of module_param

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 7e9c7b64

drivers/mmc/host/wbsd.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -71,13 +71,13 @@ static const int valid_ids[] = { 
};

};





#ifdef CONFIG_PNP

#ifdef CONFIG_PNP

static unsigned int nopnp = 0;

static unsigned int param_nopnp = 0;

#else

#else

static const unsigned int nopnp = 1;

static const unsigned int param_nopnp = 1;

#endif

#endif

static unsigned int io = 0x248;

static unsigned int param_io = 0x248;

static unsigned int irq = 6;

static unsigned int param_irq = 6;

static int dma = 2;

static int param_dma = 2;





/*

/*

 * Basic functions

 * Basic functions
@@ -1765,7 +1765,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp) 
static int __devinit wbsd_probe(struct platform_device *dev)

static int __devinit wbsd_probe(struct platform_device *dev)

{

{

	/* Use the module parameters for resources */

	/* Use the module parameters for resources */

	return wbsd_init(&dev->dev, io, irq, dma, 0);

	return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0);

}

}





static int __devexit wbsd_remove(struct platform_device *dev)

static int __devexit wbsd_remove(struct platform_device *dev)
@@ -1979,14 +1979,14 @@ static int __init wbsd_drv_init(void) 




#ifdef CONFIG_PNP

#ifdef CONFIG_PNP





	if (!nopnp) {

	if (!param_nopnp) {

		result = pnp_register_driver(&wbsd_pnp_driver);

		result = pnp_register_driver(&wbsd_pnp_driver);

		if (result < 0)

		if (result < 0)

			return result;

			return result;

	}

	}

#endif /* CONFIG_PNP */

#endif /* CONFIG_PNP */





	if (nopnp) {

	if (param_nopnp) {

		result = platform_driver_register(&wbsd_driver);

		result = platform_driver_register(&wbsd_driver);

		if (result < 0)

		if (result < 0)

			return result;

			return result;
@@ -2012,12 +2012,12 @@ static void __exit wbsd_drv_exit(void) 
{

{

#ifdef CONFIG_PNP

#ifdef CONFIG_PNP





	if (!nopnp)

	if (!param_nopnp)

		pnp_unregister_driver(&wbsd_pnp_driver);

		pnp_unregister_driver(&wbsd_pnp_driver);





#endif /* CONFIG_PNP */

#endif /* CONFIG_PNP */





	if (nopnp) {

	if (param_nopnp) {

		platform_device_unregister(wbsd_device);

		platform_device_unregister(wbsd_device);





		platform_driver_unregister(&wbsd_driver);

		platform_driver_unregister(&wbsd_driver);
@@ -2029,11 +2029,11 @@ static void __exit wbsd_drv_exit(void) 
module_init(wbsd_drv_init);

module_init(wbsd_drv_init);

module_exit(wbsd_drv_exit);

module_exit(wbsd_drv_exit);

#ifdef CONFIG_PNP

#ifdef CONFIG_PNP

module_param(nopnp, uint, 0444);

module_param_named(nopnp, param_nopnp, uint, 0444);

#endif

#endif

module_param(io, uint, 0444);

module_param_named(io, param_io, uint, 0444);

module_param(irq, uint, 0444);

module_param_named(irq, param_irq, uint, 0444);

module_param(dma, int, 0444);

module_param_named(dma, param_dma, int, 0444);





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");

MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");