From patchwork Sun Feb 8 04:35:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 22564 X-Patchwork-Delegate: jk@ozlabs.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 1A37BDE1FE for ; Sun, 8 Feb 2009 15:39:49 +1100 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A686BDDDBC; Sun, 8 Feb 2009 15:39:11 +1100 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1/sslbU2DtffPxvqucYIDqlUkYrsCiryAU@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n184d4AG011995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 8 Feb 2009 04:39:04 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n184d44S011993; Sun, 8 Feb 2009 04:39:04 GMT Message-Id: <20090208043550.971197107@am.sony.com> References: <20090208043550.681477743@am.sony.com> In-Reply-To: <20090208043550.681477743@am.sony.com> User-Agent: quilt/0.46-1 Date: Sat, 07 Feb 2009 20:35:54 -0800 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=remove-boot_option_copy.diff X-Virus-Scanned: ClamAV 0.93.3/8963/Sat Feb 7 05:53:02 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Sun, 08 Feb 2009 04:39:06 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 4/4] petitboot: Remove boot_option_copy routine X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Remove the now uneeded boot_option_copy() routine. The addition of persistant client device and boot option info make this routine uneeded. Signed-off-by: Geoff Levand --- lib/pb-protocol/pb-protocol.c | 20 -------------------- lib/pb-protocol/pb-protocol.h | 2 -- 2 files changed, 22 deletions(-) --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -38,26 +38,6 @@ * 4-byte len, id */ -/* Deep copy a boot_option. -*/ -struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt) -{ - struct boot_option *new = talloc(ctx, struct boot_option); - - if (new) { - new->id = talloc_strdup(new, opt->id); - new->name = talloc_strdup(new, opt->name); - new->description = talloc_strdup(new, opt->description); - new->icon_file = talloc_strdup(new, opt->icon_file); - new->boot_image_file = talloc_strdup(new, opt->boot_image_file); - new->initrd_file = talloc_strdup(new, opt->initrd_file); - new->boot_args = talloc_strdup(new, opt->boot_args); - memset(&new->list, 0, sizeof(new->list)); - } - - return new; -} - int pb_protocol_device_cmp(const struct device *a, const struct device *b) { return !strcmp(a->id, b->id); --- a/lib/pb-protocol/pb-protocol.h +++ b/lib/pb-protocol/pb-protocol.h @@ -45,8 +45,6 @@ struct boot_option { void *ui_info; }; -struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt); - int pb_protocol_device_len(const struct device *dev); int pb_protocol_device_cmp(const struct device *a, const struct device *b);