Changeset 638 for GPL/branches
- Timestamp:
- Jan 7, 2021, 9:45:22 PM (5 years ago)
- Location:
- GPL/branches/uniaud32-next
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_bind.c
r621 r638 18 18 // 2020-11-17 SHL 19 19 #include <../../../lib32/internal.h> 20 #pragma disable_message (201) 20 21 21 22 /* -
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_controller.c
r629 r638 31 31 #include "hda_controller_trace.h" 32 32 #else 33 #define trace_azx_pcm_close {} 34 #define trace_azx_pcm_open {} 35 #define trace_azx_pcm_prepare {} 36 #define trace_azx_pcm_hw_params {} 37 #define trace_azx_resume {} 33 #pragma disable_message (201) 34 #define trace_azx_pcm_close(...) 35 #define trace_azx_pcm_open(...) 36 #define trace_azx_pcm_prepare(...) 37 #define trace_azx_pcm_hw_params(...) 38 #define trace_azx_resume(...) 38 39 #endif 39 40 /* DSP lock helpers */ … … 112 113 struct snd_pcm_hw_params *hw_params) 113 114 { 114 struct azx_pcm *apcm = snd_pcm_substream_chip(substream);115 struct azx *chip = apcm->chip;115 //NOT_USED struct azx_pcm *apcm = snd_pcm_substream_chip(substream); 116 //NOT_USED struct azx *chip = apcm->chip; 116 117 struct azx_dev *azx_dev = get_azx_dev(substream); 117 118 int ret = 0; … … 474 475 475 476 #else 477 #ifdef NOT_USED 476 478 static int azx_get_sync_time(ktime_t *device, 477 479 struct system_counterval_t *system, void *ctx) … … 479 481 return -ENXIO; 480 482 } 483 #endif /* NOT_USED */ 481 484 #endif 482 485 -
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_intel.c
r629 r638 41 41 #ifdef TARGET_OS2 42 42 #define KBUILD_MODNAME "hda_intel" 43 #pragma disable_message (201) 43 44 #endif 44 45 … … 182 183 183 184 #ifdef CONFIG_PM 185 #ifdef NOT_USED 184 186 static int param_set_xint(const char *val, const struct kernel_param *kp); 185 187 static const struct kernel_param_ops param_ops_xint = { … … 188 190 }; 189 191 #define param_check_xint param_check_int 192 #endif /* NOT_USED */ 190 193 191 194 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; … … 202 205 * wake up. 203 206 */ 204 static bool power_save_controller = 1;207 //NOT_USED static bool power_save_controller = 1; 205 208 module_param(power_save_controller, bool, 0644); 206 209 MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode."); … … 401 404 [AZX_DRIVER_ULI] = "HDA ULI M5461", 402 405 [AZX_DRIVER_NVIDIA] = "HDA NVidia", 403 [AZX_DRIVER_TERA] = "HDA Teradici", 404 [AZX_DRIVER_CTX] = "HDA Creative", 406 [AZX_DRIVER_TERA] = "HDA Teradici", 407 [AZX_DRIVER_CTX] = "HDA Creative", 405 408 [AZX_DRIVER_CTHDA] = "HDA Creative", 406 409 [AZX_DRIVER_CMEDIA] = "HDA C-Media", … … 955 958 } 956 959 960 #ifdef NOT_USED 957 961 /* trigger power-save check at writing parameter */ 958 962 static int param_set_xint(const char *val, const struct kernel_param *kp) … … 976 980 return 0; 977 981 } 982 #endif /* NOT_USED */ 978 983 979 984 /* … … 1137 1142 #endif /* CONFIG_PM_SLEEP */ 1138 1143 1144 #ifdef NOT_USED 1139 1145 static int azx_runtime_suspend(struct device *dev) 1140 1146 { … … 1195 1201 return 0; 1196 1202 } 1203 #endif /* NOT_USED */ 1197 1204 1198 1205 static const struct dev_pm_ops azx_pm = { … … 1443 1450 { 1444 1451 struct azx *chip = device->device_data; 1445 struct hdac_bus *bus = azx_bus(chip);1452 //NOT_USED struct hdac_bus *bus = azx_bus(chip); 1446 1453 1447 1454 chip->bus.shutdown = 1; -
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_conexant.c
r629 r638 141 141 } 142 142 143 #ifdef NOT_USED 143 144 /* turn on/off EAPD according to Master switch (inversely!) for mute LED */ 144 145 static int cx_auto_vmaster_mute_led(struct led_classdev *led_cdev, … … 153 154 return 0; 154 155 } 156 #endif /* NOT_USED */ 155 157 156 158 static int cx_auto_init(struct hda_codec *codec) … … 618 620 } 619 621 622 #ifdef NOT_USED 620 623 /* update LED status via GPIO */ 621 624 static void cxt_update_gpio_led(struct hda_codec *codec, unsigned int mask, … … 660 663 return 0; 661 664 } 662 665 #endif /* NOT_USED */ 663 666 664 667 static void cxt_fixup_mute_led_gpio(struct hda_codec *codec, -
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_realtek.c
r629 r638 29 29 #ifdef TARGET_OS2 30 30 #define KBUILD_MODNAME "patch_realtek" 31 #pragma disable_message (201) 31 32 #endif 32 33 … … 4445 4446 static int alc269_suspend(struct hda_codec *codec) 4446 4447 { 4447 struct alc_spec *spec = codec->spec;4448 //NOT_USED struct alc_spec *spec = codec->spec; 4448 4449 4449 4450 #ifndef TARGET_OS2 … … 4685 4686 } 4686 4687 4688 #ifdef NOT_USED 4687 4689 static void alc_update_vref_led(struct hda_codec *codec, hda_nid_t pin, 4688 4690 bool polarity, bool on) … … 4714 4716 return 0; 4715 4717 } 4718 #endif /* NOT_USED */ 4716 4719 4717 4720 /* Make sure the led works even in runtime suspend */ … … 4742 4745 return; 4743 4746 4744 while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev)) ) {4747 while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))!=0) { 4745 4748 int pol, pin; 4746 4749 if (sscanf(dev->name, "HP_Mute_LED_%d_%x", &pol, &pin) != 2) … … 4804 4807 } 4805 4808 4809 #ifdef NOT_USED 4806 4810 /* turn on/off mute LED via GPIO per vmaster hook */ 4807 4811 static int gpio_mute_led_set(struct led_classdev *led_cdev, … … 4827 4831 return 0; 4828 4832 } 4833 #endif /* NOT_USED */ 4829 4834 4830 4835 /* setup mute and mic-mute GPIO bits, add hooks appropriately */ … … 4872 4877 } 4873 4878 4879 #ifdef NOT_USED 4874 4880 static void alc287_fixup_hp_gpio_led(struct hda_codec *codec, 4875 4881 const struct hda_fixup *fix, int action) … … 4889 4895 return 0; 4890 4896 } 4897 #endif 4891 4898 4892 4899 static void alc269_fixup_hp_gpio_mic1_led(struct hda_codec *codec, … … 4925 4932 } 4926 4933 4934 #ifdef NOT_USED 4927 4935 static void alc_update_coef_led(struct hda_codec *codec, 4928 4936 struct alc_coef_led *led, … … 4947 4955 return 0; 4948 4956 } 4957 #endif /* NOT_USED */ 4949 4958 4950 4959 static void alc285_fixup_hp_mute_led_coefbit(struct hda_codec *codec, … … 4984 4993 } 4985 4994 4995 #ifdef NOT_USED 4986 4996 /* turn on/off mic-mute LED per capture hook by coef bit */ 4987 4997 static int coef_micmute_led_set(struct led_classdev *led_cdev, … … 4995 5005 return 0; 4996 5006 } 5007 #endif /* NOT_USED */ 4997 5008 4998 5009 static void alc285_fixup_hp_coef_micmute_led(struct hda_codec *codec, … … 6164 6175 spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; 6165 6176 alc255_set_default_jack_type(codec); 6166 } 6177 } 6167 6178 else 6168 6179 alc_fixup_headset_mode(codec, fix, action); … … 6691 6702 } 6692 6703 6704 #ifdef NOT_USED 6693 6705 /* avoid DAC 0x06 for bass speaker 0x17; it has no volume control */ 6694 6706 static void alc289_fixup_asus_ga401(struct hda_codec *codec, … … 6705 6717 } 6706 6718 } 6719 #endif /* NOT_USED */ 6707 6720 6708 6721 /* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */ … … 6760 6773 6761 6774 6775 #ifdef NOT_USED 6762 6776 static void alc294_gx502_toggle_output(struct hda_codec *codec, 6763 6777 struct hda_jack_callback *cb) … … 6829 6843 } 6830 6844 } 6845 #endif /* NOT_USED */ 6831 6846 6832 6847 /* for hda_fixup_thinkpad_acpi() */ … … 7060 7075 { 0x1b, 0x23a11040 }, /* dock mic-in */ 7061 7076 {0} 7062 }; 7077 }; 7063 7078 7064 7079 static const struct hda_pintbl ALC269_FIXUP_LIFEBOOK_EXTMIC_PINS[] = { 7065 7080 { 0x19, 0x01a1903c }, /* headset mic, with jack detect */ 7066 7081 {0} 7067 }; 7082 }; 7068 7083 7069 7084 static const struct hda_pintbl ALC269_FIXUP_LIFEBOOK_HP_PIN_PINS[] = { 7070 7085 { 0x21, 0x0221102f }, /* HP out */ 7071 7086 {0} 7072 }; 7087 }; 7073 7088 7074 7089 static const struct hda_pintbl ALC269_FIXUP_AMIC_pins[] = { … … 7078 7093 { 0x19, 0x99a3092f }, /* int-mic */ 7079 7094 {0} 7080 }; 7095 }; 7081 7096 7082 7097 … … 7087 7102 { 0x18, 0x01a19c20 }, /* mic */ 7088 7103 {0} 7089 }; 7090 7104 }; 7105 7091 7106 7092 7107 static const struct hda_pintbl ALC269VB_FIXUP_AMIC_pins[] = { … … 7096 7111 { 0x21, 0x0121401f }, /* HP out */ 7097 7112 {0} 7098 }; 7113 }; 7099 7114 7100 7115 static const struct hda_pintbl ALC269VB_FIXUP_DMIC_pins[] = { -
GPL/branches/uniaud32-next/alsa-kernel/pci/hda/patch_sigmatel.c
r629 r638 324 324 } 325 325 326 #ifdef NOT_USED 326 327 /* hook for controlling mic-mute LED GPIO */ 327 328 static int stac_capture_led_update(struct led_classdev *led_cdev, … … 361 362 return 1; 362 363 } 364 #endif /* NOT_USED */ 363 365 364 366 /* prevent codec AFG to D3 state when vref-out pin is used for mute LED */ … … 373 375 } 374 376 377 #ifdef NOT_USED 375 378 /* update mute-LED accoring to the master switch */ 376 379 static void stac_update_led_status(struct hda_codec *codec, bool muted) … … 408 411 return 0; 409 412 } 413 #endif /* NOT_USED */ 410 414 411 415 /* automute hook to handle GPIO mute and EAPD updates */ … … 1199 1203 1200 1204 1201 /* 1205 /* 1202 1206 STAC 9200-32 pin configs for 1203 1207 102801B5 (Dell Inspiron 630m) … … 1216 1220 }; 1217 1221 1218 /* 1222 /* 1219 1223 STAC 9200-32 pin configs for 1220 1224 102801C2 (Dell Latitude D620) 1221 102801C8 1225 102801C8 1222 1226 102801CC (Dell Latitude D820) 1223 102801D4 1224 102801D6 1227 102801D4 1228 102801D6 1225 1229 */ 1226 1230 static const struct hda_pintbl dell9200_m22_pin_configs[] = { … … 1236 1240 }; 1237 1241 1238 /* 1242 /* 1239 1243 STAC 9200-32 pin configs for 1240 1244 102801CE (Dell XPS M1710) … … 1254 1258 1255 1259 /* 1256 STAC 9200-32 pin configs for 1260 STAC 9200-32 pin configs for 1257 1261 102801C9 1258 1262 102801CA … … 4497 4501 { 4498 4502 if (nid == codec->core.afg) 4499 snd_iprintf(buffer, "Power-Map: 0x%02x\n", 4503 snd_iprintf(buffer, "Power-Map: 0x%02x\n", 4500 4504 snd_hda_codec_read(codec, nid, 0, 4501 4505 AC_VERB_IDT_GET_POWER_MAP, 0)); -
GPL/branches/uniaud32-next/lib32/misc.c
r625 r638 276 276 proc->name = name; 277 277 proc->parent = parent; 278 proc->data = dest;278 proc->data = (void*)dest; 279 279 280 280 return proc; -
GPL/branches/uniaud32-next/lib32/regcache-rbtree.c
r625 r638 328 328 * sizeof(*present)); 329 329 } else { 330 present = rbnode->cache_present;330 present = (unsigned long *)rbnode->cache_present; 331 331 } 332 332 … … 342 342 rbnode->blklen = blklen; 343 343 rbnode->base_reg = base_reg; 344 rbnode->cache_present = present;344 rbnode->cache_present = (long*)present; 345 345 346 346 regcache_rbtree_set_register(map, rbnode, pos, value); … … 528 528 529 529 ret = regcache_sync_block(map, rbnode->block, 530 rbnode->cache_present,530 (unsigned long *)rbnode->cache_present, 531 531 rbnode->base_reg, start, end); 532 532 if (ret != 0) … … 567 567 end = rbnode->blklen; 568 568 569 bitmap_clear( rbnode->cache_present, start, end - start);569 bitmap_clear((unsigned long *)rbnode->cache_present, start, end - start); 570 570 } 571 571 -
GPL/branches/uniaud32-next/lib32/regmap.c
r625 r638 430 430 /*static inline*/ void regmap_lock_hwlock(void *__map) 431 431 { 432 struct regmap *map = __map;432 //NOT_USED struct regmap *map = __map; 433 433 434 434 // hwspin_lock_timeout(map->hwlock, UINT_MAX); … … 437 437 /*static inline*/ void regmap_lock_hwlock_irq(void *__map) 438 438 { 439 struct regmap *map = __map;439 //NOT_USED struct regmap *map = __map; 440 440 441 441 // hwspin_lock_timeout_irq(map->hwlock, UINT_MAX); … … 444 444 /*static inline*/ void regmap_lock_hwlock_irqsave(void *__map) 445 445 { 446 struct regmap *map = __map;446 //NOT_USED struct regmap *map = __map; 447 447 448 448 // hwspin_lock_timeout_irqsave(map->hwlock, UINT_MAX, … … 452 452 /*static inline*/ void regmap_unlock_hwlock(void *__map) 453 453 { 454 struct regmap *map = __map;454 //NOT_USED struct regmap *map = __map; 455 455 456 456 // hwspin_unlock(map->hwlock); … … 459 459 /*static inline*/ void regmap_unlock_hwlock_irq(void *__map) 460 460 { 461 struct regmap *map = __map;461 //NOT_USED struct regmap *map = __map; 462 462 463 463 // hwspin_unlock_irq(map->hwlock); … … 466 466 /*static inline*/ void regmap_unlock_hwlock_irqrestore(void *__map) 467 467 { 468 struct regmap *map = __map;468 //NOT_USED struct regmap *map = __map; 469 469 470 470 // hwspin_unlock_irqrestore(map->hwlock, &map->spinlock_flags); … … 1161 1161 // if (map->hwlock) 1162 1162 // hwspin_lock_free(map->hwlock); 1163 err_name:1163 //err_name: 1164 1164 // kfree_const(map->name); 1165 1165 err_map: … … 2098 2098 2099 2099 for (i = 0; i < num_regs; i++) { 2100 int reg = regs[i].reg; 2100 int reg; 2101 reg = regs[i].reg; 2101 2102 } 2102 2103 return ret;
Note:
See TracChangeset
for help on using the changeset viewer.