From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754298Ab1ALLJG (ORCPT ); Wed, 12 Jan 2011 06:09:06 -0500 Received: from zucker.schokokeks.org ([178.63.68.96]:49773 "EHLO zucker.schokokeks.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136Ab1ALLJE (ORCPT ); Wed, 12 Jan 2011 06:09:04 -0500 X-Greylist: delayed 300 seconds by postgrey-1.27 at vger.kernel.org; Wed, 12 Jan 2011 06:09:04 EST From: Hanno =?utf-8?q?B=C3=B6ck?= To: alsa-devel@alsa-project.org Subject: [PATCH] sound: constify functions in ac97 Date: Wed, 12 Jan 2011 12:03:50 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37; KDE/4.5.5; x86_64; ; ) Cc: perex@perex.cz, tiwai@suse.de, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1993305.hfn7JxYIy8"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201101121203.55901.hanno@hboeck.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --nextPart1993305.hfn7JxYIy8 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, Attached patch is an extract from grsecurity (with a minor modification to make checkpatch.pl happy) and will const some functions. Please apply. Signed-off-by: Hanno Boeck =2D-- diff -Naurp linux-2.6.37-vanilla//include/sound/ac97_codec.h linux-2.6.37- soundconst//include/sound/ac97_codec.h =2D-- linux-2.6.37-vanilla//include/sound/ac97_codec.h 2011-01-05 01:50:19.= 000000000 +0100 +++ linux-2.6.37-soundconst//include/sound/ac97_codec.h 2011-01-12 11:47:39= =2E223028874 +0100 @@ -419,15 +419,16 @@ struct snd_ac97; =20 struct snd_ac97_build_ops { =2D int (*build_3d) (struct snd_ac97 *ac97); =2D int (*build_specific) (struct snd_ac97 *ac97); =2D int (*build_spdif) (struct snd_ac97 *ac97); =2D int (*build_post_spdif) (struct snd_ac97 *ac97); + int (* const build_3d) (struct snd_ac97 *ac97); + int (* const build_specific) (struct snd_ac97 *ac97); + int (* const build_spdif) (struct snd_ac97 *ac97); + int (* const build_post_spdif) (struct snd_ac97 *ac97); #ifdef CONFIG_PM =2D void (*suspend) (struct snd_ac97 *ac97); =2D void (*resume) (struct snd_ac97 *ac97); + void (* const suspend) (struct snd_ac97 *ac97); + void (* const resume) (struct snd_ac97 *ac97); #endif =2D void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */ + /* for jack-sharing */ + void (* const update_jacks) (struct snd_ac97 *ac97); }; =20 struct snd_ac97_bus_ops { @@ -477,7 +478,7 @@ struct snd_ac97_template { =20 struct snd_ac97 { /* -- lowlevel (hardware) driver specific -- */ =2D struct snd_ac97_build_ops * build_ops; + const struct snd_ac97_build_ops *build_ops; void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ diff -Naurp linux-2.6.37-vanilla//sound/pci/ac97/ac97_codec.c linux-2.6.37- soundconst//sound/pci/ac97/ac97_codec.c =2D-- linux-2.6.37-vanilla//sound/pci/ac97/ac97_codec.c 2011-01-05 01:50:19= =2E000000000 +0100 +++ linux-2.6.37-soundconst//sound/pci/ac97/ac97_codec.c 2011-01-12 11:47:3= 3.557056258=20 +0100 @@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc } =20 /* build_ops to do nothing */ =2Dstatic struct snd_ac97_build_ops null_build_ops; +static const struct snd_ac97_build_ops null_build_ops; =20 #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) diff -Naurp linux-2.6.37-vanilla//sound/pci/ac97/ac97_patch.c linux-2.6.37- soundconst//sound/pci/ac97/ac97_patch.c =2D-- linux-2.6.37-vanilla//sound/pci/ac97/ac97_patch.c 2011-01-05 01:50:19= =2E000000000 +0100 +++ linux-2.6.37-soundconst//sound/pci/ac97/ac97_patch.c 2011-01-12 11:47:3= 4.519051590=20 +0100 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_yamaha_ymf743_ops =3D { +static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops =3D { .build_spdif =3D patch_yamaha_ymf743_build_spdif, .build_3d =3D patch_yamaha_ymf7x3_3d, }; @@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdi return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_yamaha_ymf753_ops =3D { +static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops =3D { .build_3d =3D patch_yamaha_ymf7x3_3d, .build_post_spdif =3D patch_yamaha_ymf753_post_spdif }; @@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_wolfson_wm9703_ops =3D { +static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops =3D { .build_specific =3D patch_wolfson_wm9703_specific, }; =20 @@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_wolfson_wm9704_ops =3D { +static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops =3D { .build_specific =3D patch_wolfson_wm9704_specific, }; =20 @@ -677,7 +677,7 @@ static int patch_wolfson_wm9711_specific return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_wolfson_wm9711_ops =3D { +static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops =3D { .build_specific =3D patch_wolfson_wm9711_specific, }; =20 @@ -871,7 +871,7 @@ static void patch_wolfson_wm9713_resume } #endif =20 =2Dstatic struct snd_ac97_build_ops patch_wolfson_wm9713_ops =3D { +static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops =3D { .build_specific =3D patch_wolfson_wm9713_specific, .build_3d =3D patch_wolfson_wm9713_3d, #ifdef CONFIG_PM=09 @@ -976,7 +976,7 @@ static int patch_sigmatel_stac97xx_speci return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_sigmatel_stac9700_ops =3D { +static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops =3D { .build_3d =3D patch_sigmatel_stac9700_3d, .build_specific =3D patch_sigmatel_stac97xx_specific }; @@ -1023,7 +1023,7 @@ static int patch_sigmatel_stac9708_speci return patch_sigmatel_stac97xx_specific(ac97); } =20 =2Dstatic struct snd_ac97_build_ops patch_sigmatel_stac9708_ops =3D { +static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops =3D { .build_3d =3D patch_sigmatel_stac9708_3d, .build_specific =3D patch_sigmatel_stac9708_specific }; @@ -1252,7 +1252,7 @@ static int patch_sigmatel_stac9758_speci return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_sigmatel_stac9758_ops =3D { +static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops =3D { .build_3d =3D patch_sigmatel_stac9700_3d, .build_specific =3D patch_sigmatel_stac9758_specific }; @@ -1327,7 +1327,7 @@ static int patch_cirrus_build_spdif(stru return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_cirrus_ops =3D { +static const struct snd_ac97_build_ops patch_cirrus_ops =3D { .build_spdif =3D patch_cirrus_build_spdif }; =20 @@ -1384,7 +1384,7 @@ static int patch_conexant_build_spdif(st return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_conexant_ops =3D { +static const struct snd_ac97_build_ops patch_conexant_ops =3D { .build_spdif =3D patch_conexant_build_spdif }; =20 @@ -1560,7 +1560,7 @@ static void patch_ad1881_chained(struct } } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1881_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1881_build_ops =3D { #ifdef CONFIG_PM .resume =3D ad18xx_resume #endif @@ -1647,7 +1647,7 @@ static int patch_ad1885_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1885_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1885_build_ops =3D { .build_specific =3D &patch_ad1885_specific, #ifdef CONFIG_PM .resume =3D ad18xx_resume @@ -1674,7 +1674,7 @@ static int patch_ad1886_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1886_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1886_build_ops =3D { .build_specific =3D &patch_ad1886_specific, #ifdef CONFIG_PM .resume =3D ad18xx_resume @@ -1881,7 +1881,7 @@ static int patch_ad1981a_specific(struct ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1981a_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1981a_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1981a_specific, #ifdef CONFIG_PM @@ -1936,7 +1936,7 @@ static int patch_ad1981b_specific(struct ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1981b_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1981b_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1981b_specific, #ifdef CONFIG_PM @@ -2075,7 +2075,7 @@ static int patch_ad1888_specific(struct return patch_build_controls(ac97, snd_ac97_ad1888_controls,=20 ARRAY_SIZE(snd_ac97_ad1888_controls)); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1888_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1888_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1888_specific, #ifdef CONFIG_PM @@ -2124,7 +2124,7 @@ static int patch_ad1980_specific(struct return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1980_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1980_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1980_specific, #ifdef CONFIG_PM @@ -2239,7 +2239,7 @@ static int patch_ad1985_specific(struct ARRAY_SIZE(snd_ac97_ad1985_controls)); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1985_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1985_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1985_specific, #ifdef CONFIG_PM @@ -2531,7 +2531,7 @@ static int patch_ad1986_specific(struct ARRAY_SIZE(snd_ac97_ad1985_controls)); } =20 =2Dstatic struct snd_ac97_build_ops patch_ad1986_build_ops =3D { +static const struct snd_ac97_build_ops patch_ad1986_build_ops =3D { .build_post_spdif =3D patch_ad198x_post_spdif, .build_specific =3D patch_ad1986_specific, #ifdef CONFIG_PM @@ -2636,7 +2636,7 @@ static int patch_alc650_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_alc650_ops =3D { +static const struct snd_ac97_build_ops patch_alc650_ops =3D { .build_specific =3D patch_alc650_specific, .update_jacks =3D alc650_update_jacks }; @@ -2788,7 +2788,7 @@ static int patch_alc655_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_alc655_ops =3D { +static const struct snd_ac97_build_ops patch_alc655_ops =3D { .build_specific =3D patch_alc655_specific, .update_jacks =3D alc655_update_jacks }; @@ -2900,7 +2900,7 @@ static int patch_alc850_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_alc850_ops =3D { +static const struct snd_ac97_build_ops patch_alc850_ops =3D { .build_specific =3D patch_alc850_specific, .update_jacks =3D alc850_update_jacks }; @@ -2962,7 +2962,7 @@ static int patch_cm9738_specific(struct return patch_build_controls(ac97, snd_ac97_cm9738_controls,=20 ARRAY_SIZE(snd_ac97_cm9738_controls)); } =20 =2Dstatic struct snd_ac97_build_ops patch_cm9738_ops =3D { +static const struct snd_ac97_build_ops patch_cm9738_ops =3D { .build_specific =3D patch_cm9738_specific, .update_jacks =3D cm9738_update_jacks }; @@ -3053,7 +3053,7 @@ static int patch_cm9739_post_spdif(struc return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif,=20 ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); } =20 =2Dstatic struct snd_ac97_build_ops patch_cm9739_ops =3D { +static const struct snd_ac97_build_ops patch_cm9739_ops =3D { .build_specific =3D patch_cm9739_specific, .build_post_spdif =3D patch_cm9739_post_spdif, .update_jacks =3D cm9739_update_jacks @@ -3227,7 +3227,7 @@ static int patch_cm9761_specific(struct return patch_build_controls(ac97, snd_ac97_cm9761_controls,=20 ARRAY_SIZE(snd_ac97_cm9761_controls)); } =20 =2Dstatic struct snd_ac97_build_ops patch_cm9761_ops =3D { +static const struct snd_ac97_build_ops patch_cm9761_ops =3D { .build_specific =3D patch_cm9761_specific, .build_post_spdif =3D patch_cm9761_post_spdif, .update_jacks =3D cm9761_update_jacks @@ -3323,7 +3323,7 @@ static int patch_cm9780_specific(struct return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_cont= rols)); } =20 =2Dstatic struct snd_ac97_build_ops patch_cm9780_ops =3D { +static const struct snd_ac97_build_ops patch_cm9780_ops =3D { .build_specific =3D patch_cm9780_specific, .build_post_spdif =3D patch_cm9761_post_spdif /* identical with CM9761 */ }; @@ -3443,7 +3443,7 @@ static int patch_vt1616_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_vt1616_ops =3D { +static const struct snd_ac97_build_ops patch_vt1616_ops =3D { .build_specific =3D patch_vt1616_specific }; =20 @@ -3797,7 +3797,7 @@ static int patch_it2646_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_it2646_ops =3D { +static const struct snd_ac97_build_ops patch_it2646_ops =3D { .build_specific =3D patch_it2646_specific, .update_jacks =3D it2646_update_jacks }; @@ -3831,7 +3831,7 @@ static int patch_si3036_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_si3036_ops =3D { +static const struct snd_ac97_build_ops patch_si3036_ops =3D { .build_specific =3D patch_si3036_specific, }; =20 @@ -3898,7 +3898,7 @@ static int patch_ucb1400_specific(struct return 0; } =20 =2Dstatic struct snd_ac97_build_ops patch_ucb1400_ops =3D { +static const struct snd_ac97_build_ops patch_ucb1400_ops =3D { .build_specific =3D patch_ucb1400_specific, }; =20 --nextPart1993305.hfn7JxYIy8 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk0tipsACgkQr2QksT29OyDXZQCfUmuzFLOkoSq9GrEZLL9WuBKP GwQAn24FEXlHKzJ482ax3IsmRA7tNaIj =iwNy -----END PGP SIGNATURE----- --nextPart1993305.hfn7JxYIy8--