sound: replace uses of __constant_{endian}
PATCH 1/1 sound: replace uses of __constant_{endian}
The base versions handle constant folding now.
Signed-off-by Harvey Harrison <[email protected]>
--- sound/pci/echoaudio/echo3g_dsp.c | 2 +- sound/pci/echoaudio/echoaudio_3g.c | 3 +-- sound/pci/echoaudio/echoaudio_dsp.c | 6 +++--- sound/pci/echoaudio/gina20_dsp.c | 4 ++-- sound/pci/echoaudio/layla20_dsp.c | 4 ++-- sound/pci/echoaudio/mia_dsp.c | 4 ++-- sound/pci/echoaudio/midi.c | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-)
sound/pci/echoaudio/echo3g_dsp.c +1 -1
@@ -56,7 +56,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) } chip->comm_page->e3g_frq_register = -__constant_cpu_to_le32 ((E3G_MAGIC_NUMBER /48000 ) -2 ); +cpu_to_le32 ((E3G_MAGIC_NUMBER /48000 ) -2 ); chip->device_id = device_id; chip->subdevice_id = subdevice_id; chip->bad_board = TRUE;
sound/pci/echoaudio/echoaudio_3g.c +1 -2
@@ -40,8 +40,7 @@ static int check_asic_status(struct echoaudio *chip)if (wait_handshake (chip))return -EIO ; - chip->comm_page->ext_box_status = -__constant_cpu_to_le32 (E3G_ASIC_NOT_LOADED ); + chip->comm_page->ext_box_status =cpu_to_le32 (E3G_ASIC_NOT_LOADED ); chip->asic_loaded = FALSE;clear_handshake (chip);send_vector (chip,DSP_VC_TEST_ASIC );
sound/pci/echoaudio/echoaudio_dsp.c +3 -3
@@ -926,11 +926,11 @@ static int init_dsp_comm_page(struct echoaudio *chip)/* Init the comm page */ chip->comm_page->comm_size = -__constant_cpu_to_le32 (sizeof (struct comm_page )); +cpu_to_le32 (sizeof (struct comm_page )); chip->comm_page->handshake =0xffffffff ; chip->comm_page->midi_out_free_count = -__constant_cpu_to_le32 (DSP_MIDI_OUT_FIFO_SIZE ); - chip->comm_page->sample_rate =__constant_cpu_to_le32 (44100 ); +cpu_to_le32 (DSP_MIDI_OUT_FIFO_SIZE ); + chip->comm_page->sample_rate =cpu_to_le32 (44100 ); chip->sample_rate =44100 ;/* Set line levels so we don't blast any inputs on startup */
sound/pci/echoaudio/gina20_dsp.c +2 -2
@@ -208,10 +208,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }
sound/pci/echoaudio/layla20_dsp.c +2 -2
@@ -284,10 +284,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }
sound/pci/echoaudio/mia_dsp.c +2 -2
@@ -222,10 +222,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }
sound/pci/echoaudio/midi.c +2 -2
@@ -44,10 +44,10 @@ static int enable_midi_input(struct echoaudio *chip, char enable)if (enable) { chip->mtc_state =MIDI_IN_STATE_NORMAL ; chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); +cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); }else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); + ~cpu_to_le32 (DSP_FLAG_MIDI_INPUT );clear_handshake (chip);return send_vector (chip,DSP_VC_UPDATE_FLAGS );
Signature · 1 line
1.6.2.rc0.218.gde7c
At Wed, 11 Feb 2009 14:49:30 -0800,
Quoted 4 lines · Harvey Harrison
The base versions handle constant folding now.
Signed-off-by Harvey Harrison <[email protected]>
Applied now. Thanks!
Takashi
Quoted 129 lines
--- sound/pci/echoaudio/echo3g_dsp.c | 2 +- sound/pci/echoaudio/echoaudio_3g.c | 3 +-- sound/pci/echoaudio/echoaudio_dsp.c | 6 +++--- sound/pci/echoaudio/gina20_dsp.c | 4 ++-- sound/pci/echoaudio/layla20_dsp.c | 4 ++-- sound/pci/echoaudio/mia_dsp.c | 4 ++-- sound/pci/echoaudio/midi.c | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-)sound/pci/echoaudio/echo3g_dsp.c +1
-1@@ -56,7 +56,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) } chip->comm_page->e3g_frq_register = -__constant_cpu_to_le32 ((E3G_MAGIC_NUMBER /48000 ) -2 ); +cpu_to_le32 ((E3G_MAGIC_NUMBER /48000 ) -2 ); chip->device_id = device_id; chip->subdevice_id = subdevice_id; chip->bad_board = TRUE;sound/pci/echoaudio/echoaudio_3g.c +1
-2@@ -40,8 +40,7 @@ static int check_asic_status(struct echoaudio *chip)if (wait_handshake (chip))return -EIO ; - chip->comm_page->ext_box_status = -__constant_cpu_to_le32 (E3G_ASIC_NOT_LOADED ); + chip->comm_page->ext_box_status =cpu_to_le32 (E3G_ASIC_NOT_LOADED ); chip->asic_loaded = FALSE;clear_handshake (chip);send_vector (chip,DSP_VC_TEST_ASIC );sound/pci/echoaudio/echoaudio_dsp.c +3
-3@@ -926,11 +926,11 @@ static int init_dsp_comm_page(struct echoaudio *chip)/* Init the comm page */ chip->comm_page->comm_size = -__constant_cpu_to_le32 (sizeof (struct comm_page )); +cpu_to_le32 (sizeof (struct comm_page )); chip->comm_page->handshake =0xffffffff ; chip->comm_page->midi_out_free_count = -__constant_cpu_to_le32 (DSP_MIDI_OUT_FIFO_SIZE ); - chip->comm_page->sample_rate =__constant_cpu_to_le32 (44100 ); +cpu_to_le32 (DSP_MIDI_OUT_FIFO_SIZE ); + chip->comm_page->sample_rate =cpu_to_le32 (44100 ); chip->sample_rate =44100 ;/* Set line levels so we don't blast any inputs on startup */ sound/pci/echoaudio/gina20_dsp.c +2
-2@@ -208,10 +208,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }sound/pci/echoaudio/layla20_dsp.c +2
-2@@ -284,10 +284,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }sound/pci/echoaudio/mia_dsp.c +2
-2@@ -222,10 +222,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)DE_ACT (("set_professional_spdif %d\n" , prof));if (prof) chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); +cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF );else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); + ~cpu_to_le32 (DSP_FLAG_PROFESSIONAL_SPDIF ); chip->professional_spdif = prof;return update_flags (chip); }sound/pci/echoaudio/midi.c +2
-2@@ -44,10 +44,10 @@ static int enable_midi_input(struct echoaudio *chip, char enable)if (enable) { chip->mtc_state =MIDI_IN_STATE_NORMAL ; chip->comm_page->flags |= -__constant_cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); +cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); }else chip->comm_page->flags &= - ~__constant_cpu_to_le32 (DSP_FLAG_MIDI_INPUT ); + ~cpu_to_le32 (DSP_FLAG_MIDI_INPUT );clear_handshake (chip);return send_vector (chip,DSP_VC_UPDATE_FLAGS );Signature · 1 line
1.6.2.rc0.218.gde7c