From 82f48d197f99b5dab7438a3aad396d7eada900ae Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Sun, 23 May 2010 01:02:38 +0000 Subject: [PATCH] --- yaml --- r: 198589 b: refs/heads/master c: e487639dc8ca6bd6c19a4140f45ebc88da56ddd5 h: refs/heads/master i: 198587: dac886d7b40d757d57c204812f422ad1530e1c51 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/gigaset/capi.c | 28 ++-------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index 8a4d50c1edfa..c0e18ae80d66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85a83560afa69862639fb2d6f670b4440a003335 +refs/heads/master: e487639dc8ca6bd6c19a4140f45ebc88da56ddd5 diff --git a/trunk/drivers/isdn/gigaset/capi.c b/trunk/drivers/isdn/gigaset/capi.c index 964a55fb1486..e72f86bccaa5 100644 --- a/trunk/drivers/isdn/gigaset/capi.c +++ b/trunk/drivers/isdn/gigaset/capi.c @@ -932,30 +932,6 @@ void gigaset_isdn_stop(struct cardstate *cs) * ============================ */ -/* - * load firmware - */ -static int gigaset_load_firmware(struct capi_ctr *ctr, capiloaddata *data) -{ - struct cardstate *cs = ctr->driverdata; - - /* AVM specific operation, not needed for Gigaset -- ignore */ - dev_notice(cs->dev, "load_firmware ignored\n"); - - return 0; -} - -/* - * reset (deactivate) controller - */ -static void gigaset_reset_ctr(struct capi_ctr *ctr) -{ - struct cardstate *cs = ctr->driverdata; - - /* AVM specific operation, not needed for Gigaset -- ignore */ - dev_notice(cs->dev, "reset_ctr ignored\n"); -} - /* * register CAPI application */ @@ -2213,8 +2189,8 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) iif->ctr.driverdata = cs; strncpy(iif->ctr.name, isdnid, sizeof(iif->ctr.name)); iif->ctr.driver_name = "gigaset"; - iif->ctr.load_firmware = gigaset_load_firmware; - iif->ctr.reset_ctr = gigaset_reset_ctr; + iif->ctr.load_firmware = NULL; + iif->ctr.reset_ctr = NULL; iif->ctr.register_appl = gigaset_register_appl; iif->ctr.release_appl = gigaset_release_appl; iif->ctr.send_message = gigaset_send_message;