Changeset 764 for GPL/branches


Ignore:
Timestamp:
Apr 6, 2025, 10:44:06 AM (4 months ago)
Author:
Paul Smedley
Message:

Fix warnings & typo that was causing HDA to trap

Location:
GPL/branches/uniaud32-exp
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-exp/alsa-kernel/core/pcm_lib.c

    r763 r764  
    20082008}
    20092009       
     2010#ifndef TARGET_OS2
    20102011typedef int (*pcm_transfer_f)(struct snd_pcm_substream *substream,
    20112012                              int channel, unsigned long hwoff,
    20122013                              struct iov_iter *iter, unsigned long bytes);
     2014#else
     2015typedef int (*pcm_transfer_f)(struct snd_pcm_substream *substream,
     2016                              int channel, unsigned long hwoff,
     2017                              void *iter, unsigned long bytes);
     2018#endif
    20132019
    20142020typedef int (*pcm_copy_f)(struct snd_pcm_substream *, snd_pcm_uframes_t, void *,
    … …  
    20512057 * a NULL buffer is passed
    20522058 */
     2059#ifndef TARGET_OS2
    20532060static int fill_silence(struct snd_pcm_substream *substream, int channel,
    20542061                        unsigned long hwoff, struct iov_iter *iter,
    20552062                        unsigned long bytes)
     2063#else
     2064static int fill_silence(struct snd_pcm_substream *substream, int channel,
     2065                        unsigned long hwoff, void *iter,
     2066                        unsigned long bytes)
     2067#endif
    20562068{
    20572069        struct snd_pcm_runtime *runtime = substream->runtime;

  • GPL/branches/uniaud32-exp/alsa-kernel/core/seq/seq_clientmgr.c

    r763 r764  
    446446                return -ENXIO;
    447447
    448         if (!access_ok(0, buf, count))
     448        if (!access_ok(buf, count))
    449449                return -EFAULT;
    450450

  • GPL/branches/uniaud32-exp/alsa-kernel/hda/hdac_regmap.c

    r762 r764  
    358358        .readable_reg = hda_readable_reg,
    359359        .volatile_reg = hda_volatile_reg,
     360#ifndef TARGET_OS2
    360361        .cache_type = REGCACHE_MAPLE,
     362#else
     363        .cache_type = REGCACHE_RBTREE,
     364#endif
    361365        .reg_read = hda_reg_read,
    362366        .reg_write = hda_reg_write,
    … …  
    569573                               unsigned int mask, unsigned int val)
    570574{
     575#ifndef TARGET_OS2
    571576        int err = 0;
    572 
     577#else
     578        unsigned int orig;
     579        int err;
     580#endif
    573581        if (!codec->regmap)
    574582                return reg_raw_update(codec, reg, mask, val);
    575583
    576584        mutex_lock(&codec->regmap_lock);
     585#ifndef TARGET_OS2
    577586        /* Discard any updates to already initialised registers. */
    578587        if (!regcache_reg_cached(codec->regmap, reg))
     588#else
     589        regcache_cache_only(codec->regmap, true);
     590        err = regmap_read(codec->regmap, reg, &orig);
     591        regcache_cache_only(codec->regmap, false);
     592        if (err < 0)
     593#endif
    579594                err = regmap_update_bits(codec->regmap, reg, mask, val);
    580595        mutex_unlock(&codec->regmap_lock);

  • GPL/branches/uniaud32-exp/alsa-kernel/include/sound/pcm.h

    r762 r764  
    4848struct snd_pcm_status64;
    4949struct snd_pcm_substream;
    50 
    5150struct snd_pcm_audio_tstamp_config; /* definitions further down */
    5251struct snd_pcm_audio_tstamp_report;
    … …  
    7069        int (*fill_silence)(struct snd_pcm_substream *substream, int channel,
    7170                            unsigned long pos, unsigned long bytes);
     71#ifndef TARGET_OS2
    7272        int (*copy)(struct snd_pcm_substream *substream, int channel,
    7373                    unsigned long pos, struct iov_iter *iter, unsigned long bytes);
     74#else
     75        int (*copy)(struct snd_pcm_substream *substream, int channel,
     76                    unsigned long pos, void *iter, unsigned long bytes);
     77#endif
    7478        struct page *(*page)(struct snd_pcm_substream *substream,
    7579                             unsigned long offset);

  • GPL/branches/uniaud32-exp/alsa-kernel/pci/es1938.c

    r763 r764  
    828828static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
    829829                                   int channel, unsigned long pos,
     830#ifndef TARGET_OS2
    830831                                   struct iov_iter *dst, unsigned long count)
     832#else
     833                                   void *dst, unsigned long count)
     834#endif
    831835{
    832836        struct snd_pcm_runtime *runtime = substream->runtime;

  • GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_codec.c

    r762 r764  
    31863186                                info->formats ? NULL : &info->formats,
    31873187                                info->maxbps ? NULL : &info->maxbps);
    3188                 if (err < 0)
    3189                         return err;
     3188                if (err < 0){
     3189                                codec_warn(codec,"exiting here\n");
     3190                        return err;}
    31903191        }
    31913192        if (info->ops.open == NULL)

  • GPL/branches/uniaud32-exp/alsa-kernel/pci/nm256/nm256.c

    r763 r764  
    696696snd_nm256_playback_copy(struct snd_pcm_substream *substream,
    697697                        int channel, unsigned long pos,
     698#ifndef TARGET_OS2
    698699                        struct iov_iter *src, unsigned long count)
     700#else
     701                        void *src, unsigned long count)
     702#endif
    699703{
    700704        struct snd_pcm_runtime *runtime = substream->runtime;
    … …  
    716720snd_nm256_capture_copy(struct snd_pcm_substream *substream,
    717721                       int channel, unsigned long pos,
     722#ifndef TARGET_OS2
    718723                       struct iov_iter *dst, unsigned long count)
     724#else
     725                       void *dst, unsigned long count)
     726#endif
    719727{
    720728        struct snd_pcm_runtime *runtime = substream->runtime;

  • GPL/branches/uniaud32-exp/include/asm/uaccess.h

    r763 r764  
    4848 * doing a check on the get_fs()
    4949 */
    50 static inline int __access_ok(unsigned long addr, unsigned long size)
     50static inline int __access_ok(const void __user *ptr, unsigned long size)
     51
    5152{
    5253        return 1;

  • GPL/branches/uniaud32-exp/include/linux/device.h

    r753 r764  
    8484  struct pm_dev *pm_dev;
    8585  char  bus_id[20];
    86   struct class          *class;
     86  const struct class            *class;
    8787  spinlock_t            devres_lock;
    8888  struct list_head      devres_head;

  • GPL/branches/uniaud32-exp/include/linux/math64.h

    r647 r764  
    140140#endif
    141141
     142u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
     143
    142144#endif /* MATH64_COMPAT_H */

  • GPL/branches/uniaud32-exp/include/linux/pci.h

    r760 r764  
    782782int pcim_enable_device(struct pci_dev *pdev);
    783783int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);
     784void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
    784785
    785786static inline int pci_is_managed(struct pci_dev *pdev)

  • GPL/branches/uniaud32-exp/include/linux/regmap.h

    r763 r764  
    4343        REGCACHE_NONE,
    4444        REGCACHE_RBTREE,
    45         REGCACHE_COMPRESSED,
    4645        REGCACHE_FLAT,
    4746        REGCACHE_MAPLE,

  • GPL/branches/uniaud32-exp/include/linux/string.h

    r737 r764  
    1414#endif
    1515
     16extern void *memset32(uint32_t *, uint32_t, __kernel_size_t);
    1617char *kstrdup(const char *s, unsigned int gfp_flags);
    1718_WCRTLINK extern size_t  strnlen_s( const char *__s, size_t __maxsize );

  • GPL/branches/uniaud32-exp/lib32/Makefile

    r737 r764  
    3030  strncmp.obj timer.obj kobject.obj driver.obj drivers_base.obj &
    3131  instropl2.obj instropl3.obj vsprintf.obj bitmap.obj find_next_bit.obj &
    32   regmap.obj regcache.obj regcache-flat.obj regcache-rbtree.obj component.obj
     32  regmap.obj regcache.obj regcache-flat.obj regcache-rbtree.obj &
     33  regcache-maple.obj component.obj
    3334
    3435TARGET = linuxlib

  • GPL/branches/uniaud32-exp/lib32/bitmap.c

    r639 r764  
    512512                        int nmaskbits)
    513513{
    514         if (!access_ok(VERIFY_READ, ubuf, ulen))
     514        if (!access_ok(ubuf, ulen))
    515515                return -EFAULT;
    516516        return __bitmap_parse((const char *)ubuf, ulen, 1, maskp, nmaskbits);

  • GPL/branches/uniaud32-exp/lib32/internal.h

    r652 r764  
    274274
    275275extern struct regcache_ops regcache_rbtree_ops;
    276 extern struct regcache_ops regcache_lzo_ops;
     276extern struct regcache_ops regcache_maple_ops;
    277277extern struct regcache_ops regcache_flat_ops;
    278278

  • GPL/branches/uniaud32-exp/lib32/regcache.c

    r763 r764  
    2424static const struct regcache_ops *cache_types[] = {
    2525        &regcache_rbtree_ops,
    26 #if IS_ENABLED(CONFIG_REGCACHE_COMPRESSED)
    27         &regcache_lzo_ops,
    28 #endif
     26        &regcache_maple_ops,
    2927        &regcache_flat_ops,
    3028};
Note: See TracChangeset for help on using the changeset viewer.