| Message ID | 1419878506-28684-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 26c0d8a415e5c4a01faf24165ec9dea821f6a908 |
| Headers | show |
At Mon, 29 Dec 2014 19:41:38 +0100, Lars-Peter Clausen wrote: > > Those two functions are not used anywhere and also their name is a bit to > generic to be in a global header, so remove them. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Thanks, applied all 9 patches. But the patch 3 was applied to for-linus branch for 3.19-rc, as it's an obvious fix. The rest are targeted for 3.20. Takashi > --- > include/sound/pcm_params.h | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h > index 6b1c78f..15760f5 100644 > --- a/include/sound/pcm_params.h > +++ b/include/sound/pcm_params.h > @@ -325,20 +325,6 @@ static inline int snd_interval_eq(const struct snd_interval *i1, const struct sn > i1->max == i2->max && i1->openmax == i2->openmax; > } > > -static inline unsigned int add(unsigned int a, unsigned int b) > -{ > - if (a >= UINT_MAX - b) > - return UINT_MAX; > - return a + b; > -} > - > -static inline unsigned int sub(unsigned int a, unsigned int b) > -{ > - if (a > b) > - return a - b; > - return 0; > -} > - > #define params_access(p) ((__force snd_pcm_access_t)\ > snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_ACCESS))) > #define params_format(p) ((__force snd_pcm_format_t)\ > -- > 1.8.0 >
diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h index 6b1c78f..15760f5 100644 --- a/include/sound/pcm_params.h +++ b/include/sound/pcm_params.h @@ -325,20 +325,6 @@ static inline int snd_interval_eq(const struct snd_interval *i1, const struct sn i1->max == i2->max && i1->openmax == i2->openmax; } -static inline unsigned int add(unsigned int a, unsigned int b) -{ - if (a >= UINT_MAX - b) - return UINT_MAX; - return a + b; -} - -static inline unsigned int sub(unsigned int a, unsigned int b) -{ - if (a > b) - return a - b; - return 0; -} - #define params_access(p) ((__force snd_pcm_access_t)\ snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_ACCESS))) #define params_format(p) ((__force snd_pcm_format_t)\
Those two functions are not used anywhere and also their name is a bit to generic to be in a global header, so remove them. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- include/sound/pcm_params.h | 14 -------------- 1 file changed, 14 deletions(-)