From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751918AbbJOIFG (ORCPT ); Thu, 15 Oct 2015 04:05:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:39750 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbbJOIE6 (ORCPT ); Thu, 15 Oct 2015 04:04:58 -0400 Date: Thu, 15 Oct 2015 10:04:57 +0200 Message-ID: From: Takashi Iwai To: "Mikko Rapeli" Cc: , , "Jaroslav Kysela" , Subject: Re: [PATCH v4 28/79] hdspm.h: use __u8, __u32 and __u64 from linux/types.h instead of stdint.h In-Reply-To: <1444888618-4506-29-git-send-email-mikko.rapeli@iki.fi> References: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> <1444888618-4506-29-git-send-email-mikko.rapeli@iki.fi> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 15 Oct 2015 07:56:06 +0200, Mikko Rapeli wrote: > > Kernel headers should use linux/types.h based definitions. > > Signed-off-by: Mikko Rapeli Applied, thanks. Takashi > --- > include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- > 1 file changed, 18 insertions(+), 22 deletions(-) > > diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h > index 5737332..c4db6f5 100644 > --- a/include/uapi/sound/hdspm.h > +++ b/include/uapi/sound/hdspm.h > @@ -20,11 +20,7 @@ > * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > -#ifdef __KERNEL__ > #include > -#else > -#include > -#endif > > /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ > #define HDSPM_MAX_CHANNELS 64 > @@ -46,15 +42,15 @@ enum hdspm_speed { > /* -------------------- IOCTL Peak/RMS Meters -------------------- */ > > struct hdspm_peak_rms { > - uint32_t input_peaks[64]; > - uint32_t playback_peaks[64]; > - uint32_t output_peaks[64]; > + __u32 input_peaks[64]; > + __u32 playback_peaks[64]; > + __u32 output_peaks[64]; > > - uint64_t input_rms[64]; > - uint64_t playback_rms[64]; > - uint64_t output_rms[64]; > + __u64 input_rms[64]; > + __u64 playback_rms[64]; > + __u64 output_rms[64]; > > - uint8_t speed; /* enum {ss, ds, qs} */ > + __u8 speed; /* enum {ss, ds, qs} */ > int status2; > }; > > @@ -155,21 +151,21 @@ enum hdspm_syncsource { > }; > > struct hdspm_status { > - uint8_t card_type; /* enum hdspm_io_type */ > + __u8 card_type; /* enum hdspm_io_type */ > enum hdspm_syncsource autosync_source; > > - uint64_t card_clock; > - uint32_t master_period; > + __u64 card_clock; > + __u32 master_period; > > union { > struct { > - uint8_t sync_wc; /* enum hdspm_sync */ > - uint8_t sync_madi; /* enum hdspm_sync */ > - uint8_t sync_tco; /* enum hdspm_sync */ > - uint8_t sync_in; /* enum hdspm_sync */ > - uint8_t madi_input; /* enum hdspm_madi_input */ > - uint8_t channel_format; /* enum hdspm_madi_channel_format */ > - uint8_t frame_format; /* enum hdspm_madi_frame_format */ > + __u8 sync_wc; /* enum hdspm_sync */ > + __u8 sync_madi; /* enum hdspm_sync */ > + __u8 sync_tco; /* enum hdspm_sync */ > + __u8 sync_in; /* enum hdspm_sync */ > + __u8 madi_input; /* enum hdspm_madi_input */ > + __u8 channel_format; /* enum hdspm_madi_channel_format */ > + __u8 frame_format; /* enum hdspm_madi_frame_format */ > } madi; > } card_specific; > }; > @@ -184,7 +180,7 @@ struct hdspm_status { > #define HDSPM_ADDON_TCO 1 > > struct hdspm_version { > - uint8_t card_type; /* enum hdspm_io_type */ > + __u8 card_type; /* enum hdspm_io_type */ > char cardname[20]; > unsigned int serial; > unsigned short firmware_rev; > -- > 2.5.0 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH v4 28/79] hdspm.h: use __u8, __u32 and __u64 from linux/types.h instead of stdint.h Date: Thu, 15 Oct 2015 10:04:57 +0200 Message-ID: References: <1444888618-4506-1-git-send-email-mikko.rapeli@iki.fi> <1444888618-4506-29-git-send-email-mikko.rapeli@iki.fi> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: <1444888618-4506-29-git-send-email-mikko.rapeli@iki.fi> Sender: linux-kernel-owner@vger.kernel.org To: Mikko Rapeli Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Jaroslav Kysela , linux-api@vger.kernel.org List-Id: linux-api@vger.kernel.org On Thu, 15 Oct 2015 07:56:06 +0200, Mikko Rapeli wrote: > > Kernel headers should use linux/types.h based definitions. > > Signed-off-by: Mikko Rapeli Applied, thanks. Takashi > --- > include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- > 1 file changed, 18 insertions(+), 22 deletions(-) > > diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h > index 5737332..c4db6f5 100644 > --- a/include/uapi/sound/hdspm.h > +++ b/include/uapi/sound/hdspm.h > @@ -20,11 +20,7 @@ > * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > -#ifdef __KERNEL__ > #include > -#else > -#include > -#endif > > /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ > #define HDSPM_MAX_CHANNELS 64 > @@ -46,15 +42,15 @@ enum hdspm_speed { > /* -------------------- IOCTL Peak/RMS Meters -------------------- */ > > struct hdspm_peak_rms { > - uint32_t input_peaks[64]; > - uint32_t playback_peaks[64]; > - uint32_t output_peaks[64]; > + __u32 input_peaks[64]; > + __u32 playback_peaks[64]; > + __u32 output_peaks[64]; > > - uint64_t input_rms[64]; > - uint64_t playback_rms[64]; > - uint64_t output_rms[64]; > + __u64 input_rms[64]; > + __u64 playback_rms[64]; > + __u64 output_rms[64]; > > - uint8_t speed; /* enum {ss, ds, qs} */ > + __u8 speed; /* enum {ss, ds, qs} */ > int status2; > }; > > @@ -155,21 +151,21 @@ enum hdspm_syncsource { > }; > > struct hdspm_status { > - uint8_t card_type; /* enum hdspm_io_type */ > + __u8 card_type; /* enum hdspm_io_type */ > enum hdspm_syncsource autosync_source; > > - uint64_t card_clock; > - uint32_t master_period; > + __u64 card_clock; > + __u32 master_period; > > union { > struct { > - uint8_t sync_wc; /* enum hdspm_sync */ > - uint8_t sync_madi; /* enum hdspm_sync */ > - uint8_t sync_tco; /* enum hdspm_sync */ > - uint8_t sync_in; /* enum hdspm_sync */ > - uint8_t madi_input; /* enum hdspm_madi_input */ > - uint8_t channel_format; /* enum hdspm_madi_channel_format */ > - uint8_t frame_format; /* enum hdspm_madi_frame_format */ > + __u8 sync_wc; /* enum hdspm_sync */ > + __u8 sync_madi; /* enum hdspm_sync */ > + __u8 sync_tco; /* enum hdspm_sync */ > + __u8 sync_in; /* enum hdspm_sync */ > + __u8 madi_input; /* enum hdspm_madi_input */ > + __u8 channel_format; /* enum hdspm_madi_channel_format */ > + __u8 frame_format; /* enum hdspm_madi_frame_format */ > } madi; > } card_specific; > }; > @@ -184,7 +180,7 @@ struct hdspm_status { > #define HDSPM_ADDON_TCO 1 > > struct hdspm_version { > - uint8_t card_type; /* enum hdspm_io_type */ > + __u8 card_type; /* enum hdspm_io_type */ > char cardname[20]; > unsigned int serial; > unsigned short firmware_rev; > -- > 2.5.0 > >