From patchwork Sun Dec 20 12:16:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 41506 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 61870B6F08 for ; Sun, 20 Dec 2009 23:19:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754197AbZLTMT1 (ORCPT ); Sun, 20 Dec 2009 07:19:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754218AbZLTMT0 (ORCPT ); Sun, 20 Dec 2009 07:19:26 -0500 Received: from mail-fx0-f221.google.com ([209.85.220.221]:41435 "EHLO mail-fx0-f221.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754197AbZLTMTY (ORCPT ); Sun, 20 Dec 2009 07:19:24 -0500 Received: by fxm21 with SMTP id 21so4001186fxm.21 for ; Sun, 20 Dec 2009 04:19:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=Rlt+hT3LAGY/b725m63IpDhcjq82wFkpDE/kqvHcHC0=; b=icIkJOZGx+QWYTMiVHmMs4ZFKPBXdYVeMWwc2hpx7zLcor5vTH8KXNjjs9TO9ASmco xjukxjBKPCHLrbpGrQHzXJaGwBcNdDWgcGXcAZugyQGBjj6uRbAAqK4y+PaKkQRGyDiW xsJzpUleI8KWijqD6cMwQflJwtmbfTRxYMZvo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Fpi5VFpBhe8Vhsg6zx0F5r39OWdjmN4fdL4FOMuqJEh4xpkv+EsQN0IB83fpzpToBT 00S8Etufo4wLNc5XHWTm4Gx5BidvZX40spQqXZzuCVw2fW7GKk4OjJmJlmWDltReuEQk 5dW5IMmljkJhqxmP+DW+HZ+f7hO+6Q2EFVlTc= Received: by 10.87.64.6 with SMTP id r6mr7739021fgk.48.1261311563391; Sun, 20 Dec 2009 04:19:23 -0800 (PST) Received: from localhost.localdomain (ppp91-78-16-254.pppoe.mtu-net.ru [91.78.16.254]) by mx.google.com with ESMTPS id 3sm19492563fge.0.2009.12.20.04.19.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 20 Dec 2009 04:19:22 -0800 (PST) From: Alexander Beregalov To: sparclinux@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 2/2] sparc: us2e_cpufreq.c: fix warnings/errors Date: Sun, 20 Dec 2009 15:16:36 +0300 Message-Id: <1261311396-609-2-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.6.rc3 In-Reply-To: <1261311396-609-1-git-send-email-a.beregalov@gmail.com> References: <1261311396-609-1-git-send-email-a.beregalov@gmail.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Fix warnings which become build errors since -Werror is used. arch/sparc/kernel/us2e_cpufreq.c:180: error: control reaches end of non-void function arch/sparc/kernel/us2e_cpufreq.c:203: error: control reaches end of non-void function Signed-off-by: Alexander Beregalov --- arch/sparc/kernel/us2e_cpufreq.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/sparc/kernel/us2e_cpufreq.c b/arch/sparc/kernel/us2e_cpufreq.c index 791c151..d505233 100644 --- a/arch/sparc/kernel/us2e_cpufreq.c +++ b/arch/sparc/kernel/us2e_cpufreq.c @@ -158,48 +158,56 @@ static void us2e_transition(unsigned long estar, unsigned long new_bits, static unsigned long index_to_estar_mode(unsigned int index) { + unsigned long ret = 0; + switch (index) { case 0: - return ESTAR_MODE_DIV_1; + ret = ESTAR_MODE_DIV_1; case 1: - return ESTAR_MODE_DIV_2; + ret = ESTAR_MODE_DIV_2; case 2: - return ESTAR_MODE_DIV_4; + ret = ESTAR_MODE_DIV_4; case 3: - return ESTAR_MODE_DIV_6; + ret = ESTAR_MODE_DIV_6; case 4: - return ESTAR_MODE_DIV_8; + ret = ESTAR_MODE_DIV_8; default: BUG(); }; + + return ret; } static unsigned long index_to_divisor(unsigned int index) { + unsigned long ret = 0; + switch (index) { case 0: - return 1; + ret = 1; case 1: - return 2; + ret = 2; case 2: - return 4; + ret = 4; case 3: - return 6; + ret = 6; case 4: - return 8; + ret = 8; default: BUG(); }; + + return ret; } static unsigned long estar_to_divisor(unsigned long estar)