UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: vx: Constify snd_vx_hardware and snd_vx_ops definitions 

Both snd_vx_hardware and snd_vx_ops are only referred without
modification, hence they can be constified gracefully for further
optimizations.

There should be no functional changes by this patch.

Link: https://lore.kernel.org/r/20200103081714.9560-31-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2020-01-03 09:16:46 +01:00
parent aad7ebb544
commit f8ae2d2919
8 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sound/vx_core.h
View File

@ -147,8 +147,8 @@ struct vx_core {
/* ports are defined externally */ /* ports are defined externally */
/* low-level functions */ /* low-level functions */
struct snd_vx_hardware *hw; const struct snd_vx_hardware *hw;
struct snd_vx_ops *ops; const struct snd_vx_ops *ops;
struct mutex lock; struct mutex lock;
@ -193,8 +193,9 @@ struct vx_core {
/* /*
* constructor * constructor
*/ */
struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw, struct vx_core *snd_vx_create(struct snd_card *card,
struct snd_vx_ops *ops, int extra_size); const struct snd_vx_hardware *hw,
const struct snd_vx_ops *ops, int extra_size);
int snd_vx_setup_firmware(struct vx_core *chip); int snd_vx_setup_firmware(struct vx_core *chip);
int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *dsp); int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *dsp);
int snd_vx_dsp_boot(struct vx_core *chip, const struct firmware *dsp); int snd_vx_dsp_boot(struct vx_core *chip, const struct firmware *dsp);

5
sound/drivers/vx/vx_core.c
View File

@ -765,8 +765,9 @@ EXPORT_SYMBOL(snd_vx_resume);
* *
* return the instance pointer if successful, NULL in error. * return the instance pointer if successful, NULL in error.
*/ */
struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw, struct vx_core *snd_vx_create(struct snd_card *card,
struct snd_vx_ops *ops, const struct snd_vx_hardware *hw,
const struct snd_vx_ops *ops,
int extra_size) int extra_size)
{ {
struct vx_core *chip; struct vx_core *chip;

12
sound/pci/vx222/vx222.c
View File

@ -62,7 +62,7 @@ MODULE_DEVICE_TABLE(pci, snd_vx222_ids);
static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0); static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
static const DECLARE_TLV_DB_SCALE(db_scale_akm, -7350, 50, 0); static const DECLARE_TLV_DB_SCALE(db_scale_akm, -7350, 50, 0);
static struct snd_vx_hardware vx222_old_hw = { static const struct snd_vx_hardware vx222_old_hw = {
.name = "VX222/Old", .name = "VX222/Old",
.type = VX_TYPE_BOARD, .type = VX_TYPE_BOARD,
@ -74,7 +74,7 @@ static struct snd_vx_hardware vx222_old_hw = {
.output_level_db_scale = db_scale_old_vol, .output_level_db_scale = db_scale_old_vol,
}; };
static struct snd_vx_hardware vx222_v2_hw = { static const struct snd_vx_hardware vx222_v2_hw = {
.name = "VX222/v2", .name = "VX222/v2",
.type = VX_TYPE_V2, .type = VX_TYPE_V2,
@ -86,7 +86,7 @@ static struct snd_vx_hardware vx222_v2_hw = {
.output_level_db_scale = db_scale_akm, .output_level_db_scale = db_scale_akm,
}; };
static struct snd_vx_hardware vx222_mic_hw = { static const struct snd_vx_hardware vx222_mic_hw = {
.name = "VX222/Mic", .name = "VX222/Mic",
.type = VX_TYPE_MIC, .type = VX_TYPE_MIC,
@ -122,7 +122,7 @@ static int snd_vx222_dev_free(struct snd_device *device)
static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci, static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci,
struct snd_vx_hardware *hw, const struct snd_vx_hardware *hw,
struct snd_vx222 **rchip) struct snd_vx222 **rchip)
{ {
struct vx_core *chip; struct vx_core *chip;
@ -131,7 +131,7 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci,
static const struct snd_device_ops ops = { static const struct snd_device_ops ops = {
.dev_free = snd_vx222_dev_free, .dev_free = snd_vx222_dev_free,
}; };
struct snd_vx_ops *vx_ops; const struct snd_vx_ops *vx_ops;
/* enable PCI device */ /* enable PCI device */
if ((err = pci_enable_device(pci)) < 0) if ((err = pci_enable_device(pci)) < 0)
@ -180,7 +180,7 @@ static int snd_vx222_probe(struct pci_dev *pci,
{ {
static int dev; static int dev;
struct snd_card *card; struct snd_card *card;
struct snd_vx_hardware *hw; const struct snd_vx_hardware *hw;
struct snd_vx222 *vx; struct snd_vx222 *vx;
int err; int err;

4
sound/pci/vx222/vx222.h
View File

@ -31,8 +31,8 @@ struct snd_vx222 {
/* we use a lookup table with 148 values, see vx_mixer.c */ /* we use a lookup table with 148 values, see vx_mixer.c */
#define VX2_AKM_LEVEL_MAX 0x93 #define VX2_AKM_LEVEL_MAX 0x93
extern struct snd_vx_ops vx222_ops; extern const struct snd_vx_ops vx222_ops;
extern struct snd_vx_ops vx222_old_ops; extern const struct snd_vx_ops vx222_old_ops;
/* Offset of registers with base equal to portDSP. */ /* Offset of registers with base equal to portDSP. */
#define VX_RESET_DMA_REGISTER_OFFSET 0x00000008 #define VX_RESET_DMA_REGISTER_OFFSET 0x00000008

4
sound/pci/vx222/vx222_ops.c
View File

@ -984,7 +984,7 @@ static int vx2_add_mic_controls(struct vx_core *_chip)
/* /*
* callbacks * callbacks
*/ */
struct snd_vx_ops vx222_ops = { const struct snd_vx_ops vx222_ops = {
.in8 = vx2_inb, .in8 = vx2_inb,
.in32 = vx2_inl, .in32 = vx2_inl,
.out8 = vx2_outb, .out8 = vx2_outb,
@ -1004,7 +1004,7 @@ struct snd_vx_ops vx222_ops = {
}; };
/* for old VX222 board */ /* for old VX222 board */
struct snd_vx_ops vx222_old_ops = { const struct snd_vx_ops vx222_old_ops = {
.in8 = vx2_inb, .in8 = vx2_inb,
.in32 = vx2_inl, .in32 = vx2_inl,
.out8 = vx2_outb, .out8 = vx2_outb,

2
sound/pcmcia/vx/vxp_ops.c
View File

@ -581,7 +581,7 @@ static void vxp_reset_board(struct vx_core *_chip, int cold_reset)
* callbacks * callbacks
*/ */
/* exported */ /* exported */
struct snd_vx_ops snd_vxpocket_ops = { const struct snd_vx_ops snd_vxpocket_ops = {
.in8 = vxp_inb, .in8 = vxp_inb,
.out8 = vxp_outb, .out8 = vxp_outb,
.test_and_ack = vxp_test_and_ack, .test_and_ack = vxp_test_and_ack,

4
sound/pcmcia/vx/vxpocket.c
View File

@ -82,7 +82,7 @@ static int snd_vxpocket_dev_free(struct snd_device *device)
static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0); static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
static struct snd_vx_hardware vxpocket_hw = { static const struct snd_vx_hardware vxpocket_hw = {
.name = "VXPocket", .name = "VXPocket",
.type = VX_TYPE_VXPOCKET, .type = VX_TYPE_VXPOCKET,
@ -104,7 +104,7 @@ static struct snd_vx_hardware vxpocket_hw = {
* UER, but only for the first two inputs and outputs. * UER, but only for the first two inputs and outputs.
*/ */
static struct snd_vx_hardware vxp440_hw = { static const struct snd_vx_hardware vxp440_hw = {
.name = "VXPocket440", .name = "VXPocket440",
.type = VX_TYPE_VXP440, .type = VX_TYPE_VXP440,

2
sound/pcmcia/vx/vxpocket.h
View File

@ -32,7 +32,7 @@ struct snd_vxpocket {
#define to_vxpocket(x) container_of(x, struct snd_vxpocket, core) #define to_vxpocket(x) container_of(x, struct snd_vxpocket, core)
extern struct snd_vx_ops snd_vxpocket_ops; extern const struct snd_vx_ops snd_vxpocket_ops;
void vx_set_mic_boost(struct vx_core *chip, int boost); void vx_set_mic_boost(struct vx_core *chip, int boost);
void vx_set_mic_level(struct vx_core *chip, int level); void vx_set_mic_level(struct vx_core *chip, int level);