Commit d76596b1 authored by Clemens Ladisch's avatar Clemens Ladisch
Browse files

ALSA: oxygen: rename pcm_dev_cfg 



Rename the pcm_dev_cfg field to device_config because there will be
additional flags that do not describe PCM devices.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent c3f00739

sound/pci/oxygen/hifier.c

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static const struct oxygen_model model_hifier = { 
	.update_dac_mute = update_ak4396_mute,

	.dac_tlv = ak4396_db_scale,

	.model_data_size = sizeof(struct hifier_data),

	.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 CAPTURE_0_FROM_I2S_1,

	.dac_channels = 2,

sound/pci/oxygen/oxygen.c

+10 −10
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int generic_probe(struct oxygen *chip, unsigned long driver_data) 
		chip->model.init = meridian_init;

		chip->model.resume = ak4396_registers_init;

		chip->model.set_adc_params = set_ak5385_params;

		chip->model.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

		chip->model.device_config = PLAYBACK_0_TO_I2S |

					    PLAYBACK_1_TO_SPDIF |

					    CAPTURE_0_FROM_I2S_2 |

					    CAPTURE_1_FROM_SPDIF;
@@ -316,7 +316,7 @@ static const struct oxygen_model model_generic = { 
	.update_dac_mute = update_ak4396_mute,

	.dac_tlv = ak4396_db_scale,

	.model_data_size = sizeof(struct generic_data),

	.pcm_dev_cfg = PLAYBACK_0_TO_I2S |

	.device_config = PLAYBACK_0_TO_I2S |

			 PLAYBACK_1_TO_SPDIF |

			 PLAYBACK_2_TO_AC97_1 |

			 CAPTURE_0_FROM_I2S_1 |

sound/pci/oxygen/oxygen.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct oxygen_model { 
			    unsigned int reg, unsigned int mute);

	const unsigned int *dac_tlv;

	size_t model_data_size;

	unsigned int pcm_dev_cfg;

	unsigned int device_config;

	u8 dac_channels;

	u8 dac_volume_min;

	u8 dac_volume_max;

sound/pci/oxygen/oxygen_lib.c

+5 −5
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void oxygen_init(struct oxygen *chip) 
		       OXYGEN_RATE_48000 | chip->model.dac_i2s_format |

		       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |

		       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);

	if (chip->model.pcm_dev_cfg & CAPTURE_0_FROM_I2S_1)

	if (chip->model.device_config & CAPTURE_0_FROM_I2S_1)

		oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,

			       OXYGEN_RATE_48000 | chip->model.adc_i2s_format |

			       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |
@@ -281,7 +281,7 @@ static void oxygen_init(struct oxygen *chip) 
	else

		oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,

			       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);

	if (chip->model.pcm_dev_cfg & (CAPTURE_0_FROM_I2S_2 |

	if (chip->model.device_config & (CAPTURE_0_FROM_I2S_2 |

					 CAPTURE_2_FROM_I2S_2))

		oxygen_write16(chip, OXYGEN_I2S_B_FORMAT,

			       OXYGEN_RATE_48000 | chip->model.adc_i2s_format |
@@ -295,7 +295,7 @@ static void oxygen_init(struct oxygen *chip) 
	oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,

			    OXYGEN_SPDIF_OUT_ENABLE |

			    OXYGEN_SPDIF_LOOPBACK);

	if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF)

	if (chip->model.device_config & CAPTURE_1_FROM_SPDIF)

		oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL,

				      OXYGEN_SPDIF_SENSE_MASK |

				      OXYGEN_SPDIF_LOCK_MASK |
@@ -514,7 +514,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 
	oxygen_proc_init(chip);



	spin_lock_irq(&chip->reg_lock);

	if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF)

	if (chip->model.device_config & CAPTURE_1_FROM_SPDIF)

		chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT;

	if (chip->has_ac97_0 | chip->has_ac97_1)

		chip->interrupt_mask |= OXYGEN_INT_AC97;

sound/pci/oxygen/oxygen_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -974,14 +974,14 @@ int oxygen_mixer_init(struct oxygen *chip) 
	err = add_controls(chip, controls, ARRAY_SIZE(controls));

	if (err < 0)

		return err;

	if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF) {

	if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) {

		err = add_controls(chip, spdif_input_controls,

				   ARRAY_SIZE(spdif_input_controls));

		if (err < 0)

			return err;

	}

	for (i = 0; i < ARRAY_SIZE(monitor_controls); ++i) {

		if (!(chip->model.pcm_dev_cfg & monitor_controls[i].pcm_dev))

		if (!(chip->model.device_config & monitor_controls[i].pcm_dev))

			continue;

		err = add_controls(chip, monitor_controls[i].controls,

				   ARRAY_SIZE(monitor_controls[i].controls));