From owner-svn-src-all@freebsd.org Tue Aug 9 15:56:35 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 075EFBB2986; Tue, 9 Aug 2016 15:56:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B10E51F6E; Tue, 9 Aug 2016 15:56:34 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u79FuXfQ084411; Tue, 9 Aug 2016 15:56:33 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u79FuX86084409; Tue, 9 Aug 2016 15:56:33 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201608091556.u79FuX86084409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 9 Aug 2016 15:56:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303876 - head/sys/dev/nand X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2016 15:56:35 -0000 Author: trasz Date: Tue Aug 9 15:56:33 2016 New Revision: 303876 URL: https://svnweb.freebsd.org/changeset/base/303876 Log: Remove NULL checks after M_WAITOK allocations from nand(4). MFC after: 1 month Modified: head/sys/dev/nand/nand_generic.c head/sys/dev/nand/nandsim_chip.c Modified: head/sys/dev/nand/nand_generic.c ============================================================================== --- head/sys/dev/nand/nand_generic.c Tue Aug 9 15:55:14 2016 (r303875) +++ head/sys/dev/nand/nand_generic.c Tue Aug 9 15:56:33 2016 (r303876) @@ -228,8 +228,6 @@ generic_nand_attach(device_t dev) if (ivar->is_onfi) { onfi_chip_params = malloc(sizeof(struct onfi_chip_params), M_NAND, M_WAITOK | M_ZERO); - if (onfi_chip_params == NULL) - return (ENOMEM); if (onfi_read_parameter(chip, onfi_chip_params)) { nand_debug(NDBG_GEN,"Could not read parameter page!\n"); @@ -741,10 +739,6 @@ onfi_is_blk_bad(device_t device, uint32_ chip = device_get_softc(device); oob = malloc(chip->chip_geom.oob_size, M_NAND, M_WAITOK); - if (!oob) { - device_printf(device, "%s: cannot allocate oob\n", __func__); - return (ENOMEM); - } page_number = block_number * chip->chip_geom.pgs_per_blk; *bad = 0; @@ -1001,10 +995,6 @@ generic_is_blk_bad(device_t dev, uint32_ chip = device_get_softc(dev); oob = malloc(chip->chip_geom.oob_size, M_NAND, M_WAITOK); - if (!oob) { - device_printf(dev, "%s: cannot allocate OOB\n", __func__); - return (ENOMEM); - } page_number = block * chip->chip_geom.pgs_per_blk; *bad = 0; Modified: head/sys/dev/nand/nandsim_chip.c ============================================================================== --- head/sys/dev/nand/nandsim_chip.c Tue Aug 9 15:55:14 2016 (r303875) +++ head/sys/dev/nand/nandsim_chip.c Tue Aug 9 15:56:33 2016 (r303876) @@ -90,8 +90,6 @@ nandsim_chip_init(struct nandsim_softc* int error; chip = malloc(sizeof(*chip), M_NANDSIM, M_WAITOK | M_ZERO); - if (!chip) - return (NULL); mtx_init(&chip->ns_lock, "nandsim lock", NULL, MTX_DEF); callout_init(&chip->ns_callout, 1); @@ -206,9 +204,6 @@ nandsim_blk_state_init(struct nandsim_ch chip->blk_state = malloc(size * sizeof(struct nandsim_block_state), M_NANDSIM, M_WAITOK | M_ZERO); - if (!chip->blk_state) { - return (-1); - } for (i = 0; i < size; i++) { if (wear_lev)