From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296AbWEAHLZ (ORCPT ); Mon, 1 May 2006 03:11:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751298AbWEAHLZ (ORCPT ); Mon, 1 May 2006 03:11:25 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:40721 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1751296AbWEAHLY (ORCPT ); Mon, 1 May 2006 03:11:24 -0400 Date: Mon, 1 May 2006 09:11:24 +0200 From: Adrian Bunk To: Andrew Morton Cc: jgarzik@pobox.com, linux-kernel@vger.kernel.org Subject: [2.6 patch] drivers/char/hw_random.c: remove assert()'s Message-ID: <20060501071124.GC3570@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch removes the assert()'s from drivers/char/hw_random.c since you both needed to enable a manual option in the driver source to make them effective and they only covered some obviously impossible cases. Signed-off-by: Adrian Bunk --- This patch was already sent on: - 13 Apr 2006 drivers/char/hw_random.c | 21 --------------------- 1 file changed, 21 deletions(-) --- linux-2.6.17-rc1-mm2-full/drivers/char/hw_random.c.old 2006-04-13 10:37:15.000000000 +0200 +++ linux-2.6.17-rc1-mm2-full/drivers/char/hw_random.c 2006-04-13 10:37:39.000000000 +0200 @@ -66,17 +66,6 @@ #define DPRINTK(fmt, args...) pr_debug(PFX "%s: " fmt, __FUNCTION__ , ## args) -#undef RNG_NDEBUG /* define to enable lightweight runtime checks */ -#ifdef RNG_NDEBUG -#define assert(expr) \ - if(!(expr)) { \ - printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s," \ - "line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__); \ - } -#else -#define assert(expr) -#endif - #define RNG_MISCDEV_MINOR 183 /* official */ static int rng_dev_open (struct inode *inode, struct file *filp); @@ -211,29 +200,23 @@ static inline u8 intel_hwstatus (void) { - assert (rng_mem != NULL); return readb (rng_mem + INTEL_RNG_HW_STATUS); } static inline u8 intel_hwstatus_set (u8 hw_status) { - assert (rng_mem != NULL); writeb (hw_status, rng_mem + INTEL_RNG_HW_STATUS); return intel_hwstatus (); } static unsigned int intel_data_present(void) { - assert (rng_mem != NULL); - return (readb (rng_mem + INTEL_RNG_STATUS) & INTEL_RNG_DATA_PRESENT) ? 1 : 0; } static u32 intel_data_read(void) { - assert (rng_mem != NULL); - return readb (rng_mem + INTEL_RNG_DATA); } @@ -495,7 +478,6 @@ { u32 val; - assert(geode_rng_base != NULL); val = readl(geode_rng_base + GEODE_RNG_DATA_REG); return val; } @@ -504,7 +486,6 @@ { u32 val; - assert(geode_rng_base != NULL); val = readl(geode_rng_base + GEODE_RNG_STATUS_REG); return val; } @@ -605,8 +586,6 @@ DPRINTK ("ENTER\n"); - assert(rng_ops != NULL); - rc = rng_ops->init(dev); if (rc) goto err_out;