As the services directory is going to be removed, this patch is needed. ntfy.c only contained the function dsp_notifier_event(), and since this function calls sync_set_event(), then the dsp_notifier_event() is moved to the sync.c file.
Signed-off-by: Ivan Gomez Castellanos <[email protected]> --- drivers/staging/tidspbridge/Makefile | 2 +- drivers/staging/tidspbridge/core/sync.c | 17 ++++++++++++++ drivers/staging/tidspbridge/services/ntfy.c | 31 --------------------------- 3 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 drivers/staging/tidspbridge/services/ntfy.c diff --git a/drivers/staging/tidspbridge/Makefile b/drivers/staging/tidspbridge/Makefile index 50be983..8a13982 100644 --- a/drivers/staging/tidspbridge/Makefile +++ b/drivers/staging/tidspbridge/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_TIDSPBRIDGE) += bridgedriver.o libgen = gen/gb.o gen/gs.o gen/gh.o gen/uuidutil.o libservices = services/cfg.o \ - services/ntfy.o services/services.o + services/services.o libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \ core/tiomap3430_pwr.o core/tiomap_io.o \ core/ue_deh.o core/wdt.o core/dsp-clock.o core/sync.o diff --git a/drivers/staging/tidspbridge/core/sync.c b/drivers/staging/tidspbridge/core/sync.c index 9010b37..995986a 100644 --- a/drivers/staging/tidspbridge/core/sync.c +++ b/drivers/staging/tidspbridge/core/sync.c @@ -21,6 +21,7 @@ /* ----------------------------------- This */ #include <dspbridge/sync.h> +#include <dspbridge/ntfy.h> DEFINE_SPINLOCK(sync_lock); @@ -102,3 +103,19 @@ func_end: return status; } +/** + * dsp_notifier_event() - callback function to nofity events + * @this: pointer to itself struct notifier_block + * @event: event to be notified. + * @data: Currently not used. + * + */ +int dsp_notifier_event(struct notifier_block *this, unsigned long event, + void *data) +{ + struct ntfy_event *ne = container_of(this, struct ntfy_event, + noti_block); + if (ne->event & event) + sync_set_event(&ne->sync_obj); + return NOTIFY_OK; +} diff --git a/drivers/staging/tidspbridge/services/ntfy.c b/drivers/staging/tidspbridge/services/ntfy.c deleted file mode 100644 index a2ea698..0000000 --- a/drivers/staging/tidspbridge/services/ntfy.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * ntfy.c - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Manage lists of notification events. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -/* ----------------------------------- This */ -#include <dspbridge/ntfy.h> - -int dsp_notifier_event(struct notifier_block *this, unsigned long event, - void *data) -{ - struct ntfy_event *ne = container_of(this, struct ntfy_event, - noti_block); - if (ne->event & event) - sync_set_event(&ne->sync_obj); - return NOTIFY_OK; -} - -- 1.7.0.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
