The patch titled
sound/soc/soc-dapm.c: make 4 functions static
has been added to the -mm tree. Its filename is
sound-soc-soc-dapmc-make-4-functions-static.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sound/soc/soc-dapm.c: make 4 functions static
From: Adrian Bunk <bunk@xxxxxxxxx>
Make the following needlessly global functions static:
- dapm_power_widgets()
- dapm_mux_update_power()
- dapm_mixer_update_power()
- dapm_free_widgets()
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/soc/soc-dapm.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff -puN sound/soc/soc-dapm.c~sound-soc-soc-dapmc-make-4-functions-static sound/soc/soc-dapm.c
--- a/sound/soc/soc-dapm.c~sound-soc-soc-dapmc-make-4-functions-static
+++ a/sound/soc/soc-dapm.c
@@ -463,7 +463,7 @@ static int is_connected_input_ep(struct
* o Input pin to Output pin (bypass, sidetone)
* o DAC to ADC (loopback).
*/
-int dapm_power_widgets(struct snd_soc_codec *codec, int event)
+static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
{
struct snd_soc_dapm_widget *w;
int in, out, i, c = 1, *seq = NULL, ret = 0, power_change, power;
@@ -664,8 +664,9 @@ static void dbg_dump_dapm(struct snd_soc
#endif
/* test and update the power status of a mux widget */
-int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
- struct snd_kcontrol *kcontrol, int mask, int val, struct soc_enum* e)
+static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
+ struct snd_kcontrol *kcontrol, int mask,
+ int val, struct soc_enum* e)
{
struct snd_soc_dapm_path *path;
int found = 0;
@@ -697,11 +698,11 @@ int dapm_mux_update_power(struct snd_soc
return 0;
}
-EXPORT_SYMBOL_GPL(dapm_mux_update_power);
/* test and update the power status of a mixer widget */
-int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
- struct snd_kcontrol *kcontrol, int reg, int val_mask, int val, int invert)
+static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
+ struct snd_kcontrol *kcontrol, int reg,
+ int val_mask, int val, int invert)
{
struct snd_soc_dapm_path *path;
int found = 0;
@@ -733,7 +734,6 @@ int dapm_mixer_update_power(struct snd_s
return 0;
}
-EXPORT_SYMBOL_GPL(dapm_mixer_update_power);
/* show dapm widget status in sys fs */
static ssize_t dapm_widget_show(struct device *dev,
@@ -808,7 +808,7 @@ static void snd_soc_dapm_sys_remove(stru
}
/* free all dapm widgets and resources */
-void dapm_free_widgets(struct snd_soc_codec *codec)
+static void dapm_free_widgets(struct snd_soc_codec *codec)
{
struct snd_soc_dapm_widget *w, *next_w;
struct snd_soc_dapm_path *p, *next_p;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
make-drivers-acpi-baycdrive_bays-static.patch
make-drivers-acpi-eccec_ecdt-static.patch
drivers-acpi-oslc-fix-a-null-check.patch
git-alsa.patch
sound-soc-soc-dapmc-make-4-functions-static.patch
tidy-gregkh-driver-udev-compatible-hack.patch
git-dvb.patch
git-gfs2-nmw.patch
fs-dlm-lowcomms-tcpc-remove-2-functions.patch
git-mtd.patch
make-drivers-mtd-cmdlinepartcmtdpart_setup-static.patch
git-net.patch
net-possible-cleanups.patch
net-uninline-skb_put-fix.patch
git-ocfs2.patch
drivers-pci-hotplug-ibmphp_pcic-fix-null-dereference.patch
git-scsi-misc.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
drivers-scsi-aic7xxx-make-functions-static.patch
make-qla2x00_reg_remote_port-static.patch
make-drivers-usb-host-u132-hcdcu132_hcd_wait-static.patch
make-drivers-usb-input-wacom_syscwacom_sys_irq-static.patch
drivers-usb-misc-ftdi-elanc-fixes-and-cleanups.patch
make-drivers-usb-core-drivercusb_device_match-static.patch
arch-i386-kernel-remove-remaining-pc98-code.patch
git-cryptodev.patch
make-mm-thrashcglobal_faults-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
remove-drivers-pci-searchcpci_find_device_reverse.patch
ext4_ext_split-remove-dead-code.patch
the-scheduled-removal-of-some-oss-options.patch
make-arch-i386-pci-commoncpci_bf_sort-static.patch
make-mm-shmemcshmem_xattr_security_handler-static.patch
remove-kernel-lockdepclockdep_internal.patch
make-kernel-signalckill_proc_info-static.patch
make-ecryptfs_version_str_map-static.patch
make-fs-jbd-transactionc__journal_temp_unlink_buffer-static.patch
make-fs-jbd2-transactionc__jbd2_journal_temp_unlink_buffer-static.patch
fs-lockd-hostc-make-2-functions-static.patch
make-fs-proc-basecproc_pid_instantiate-static.patch
make-ext2_get_blocks-static.patch
generic-bug-implementation-include-linux-bugh-must-always-include-linux-moduleh.patch
drivers-mtd-nand-rtc_from4c-use-lib-bitrevc.patch
fsstack-introduce-fsstack_copy_attrinode_-fs-stackc-should-include-linux-fs_stackh.patch
i4l-remove-the-broken-hisax_amd7930-option.patch
readahead-events-accounting-make-readahead_debug_level-static.patch
reiser4-export-remove_from_page_cache-fix.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
fs-reiser4-possible-cleanups-2.patch
fs-reiser4-more-possible-cleanups.patch
make-drivers-md-dm-snapcksnapd-static.patch
gtod-persistent-clock-support-core-remove-kernel-timercwall_jiffies.patch
gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-make-kernel-timerc__next_timer_interrupt-static.patch
updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
