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

Commit 83c51c0a authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela
Browse files

[ALSA] isa_bus device/driver naming 



isa_bus: delete snd_ prefix from the (sysfs visible) device/driver names.

Signed-off-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent e4b6088c

sound/isa/cmi8330.c

+2 −2
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n) 
}

#endif



#define CMI8330_DRIVER	"snd_cmi8330"

#define DEV_NAME	"cmi8330"



static struct isa_driver snd_cmi8330_driver = {

	.match		= snd_cmi8330_isa_match,
@@ -612,7 +612,7 @@ static struct isa_driver snd_cmi8330_driver = { 
	.resume		= snd_cmi8330_isa_resume,

#endif

	.driver		= {

		.name	= CMI8330_DRIVER

		.name	= DEV_NAME

	},

};

sound/isa/cs423x/cs4236.c

+3 −3
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," 


#ifdef CS4232

#define IDENT "CS4232"

#define CS423X_DRIVER "snd_cs4232"

#define DEV_NAME "cs4232"

#else

#define IDENT "CS4236+"

#define CS423X_DRIVER "snd_cs4236"

#define DEV_NAME "cs4236"

#endif



static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
@@ -630,7 +630,7 @@ static struct isa_driver cs423x_isa_driver = { 
	.resume		= snd_cs423x_isa_resume,

#endif

	.driver		= {

		.name	= CS423X_DRIVER

		.name	= DEV_NAME

	},

};

sound/isa/es18xx.c

+2 −2
Original line number Diff line number Diff line
@@ -2318,7 +2318,7 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n) 
}

#endif



#define ES18XX_DRIVER	"snd_es18xx"

#define DEV_NAME "es18xx"



static struct isa_driver snd_es18xx_isa_driver = {

	.match		= snd_es18xx_isa_match,
@@ -2329,7 +2329,7 @@ static struct isa_driver snd_es18xx_isa_driver = { 
	.resume		= snd_es18xx_isa_resume,

#endif

	.driver		= {

		.name	= ES18XX_DRIVER

		.name	= DEV_NAME

	},

};

sound/isa/gus/gusmax.c

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev) 
	return 0;

}



#define GUSMAX_DRIVER	"snd_gusmax"

#define DEV_NAME "gusmax"



static struct isa_driver snd_gusmax_driver = {

	.match		= snd_gusmax_match,
@@ -366,7 +366,7 @@ static struct isa_driver snd_gusmax_driver = { 
	.remove		= __devexit_p(snd_gusmax_remove),

	/* FIXME: suspend/resume */

	.driver		= {

		.name	= GUSMAX_DRIVER

		.name	= DEV_NAME

	},

};

sound/isa/opl3sa2.c

+2 −2
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n) 
}

#endif



#define OPL3SA2_DRIVER	"snd_opl3sa2"

#define DEV_NAME "opl3sa2"



static struct isa_driver snd_opl3sa2_isa_driver = {

	.match		= snd_opl3sa2_isa_match,
@@ -958,7 +958,7 @@ static struct isa_driver snd_opl3sa2_isa_driver = { 
	.resume		= snd_opl3sa2_isa_resume,

#endif

	.driver		= {

		.name	= OPL3SA2_DRIVER

		.name	= DEV_NAME

	},

};