From patchwork Thu Dec 4 20:09:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirza Krak X-Patchwork-Id: 5439961 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 87338BEEA8 for ; Thu, 4 Dec 2014 20:09:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98C3E202B8 for ; Thu, 4 Dec 2014 20:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D19B20295 for ; Thu, 4 Dec 2014 20:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754637AbaLDUJe (ORCPT ); Thu, 4 Dec 2014 15:09:34 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:49580 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754053AbaLDUJe (ORCPT ); Thu, 4 Dec 2014 15:09:34 -0500 Received: by mail-la0-f41.google.com with SMTP id hv19so10344982lab.0 for ; Thu, 04 Dec 2014 12:09:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hG5DSrP/4rNbwcZM2SoUbML9G0gC3K7mfe1KYjsal9E=; b=YV/fPk3HRgpi/R4b64i08Y1eGNQMOgsFbpU5qzvYiPmFi1MjXF4ebmDKrAkJQi4dQR D1T0rfl27UvkjqYxjIsQy82cM8lPOS4TfwdeN/1our6fF+8Klo8TqD/avEo6A1btITkX WwAztSdn6HiE1pco8wMEB/HPEtWAKv2LC2BMYvkkbzjlmRuysxnoLqmwl45ySp2Kc1zJ 92Z2wfFceGYC8TS4o28BVxROlhuqH3uV1HMOARudpV2azV3HHp0Snn2VIh+Ycb25f7Ax mtm9w3Hj39d+QT2vz1dbHwBBA6KClUbXil/8XdI6u7X/Rl9dlTPmcl1ejekJw79IRT3B BsLA== X-Gm-Message-State: ALoCoQnU1kycOS8iEdwSow5JSRvahiL/DW/kS7LMeu0TEacok/8iq8+IQYdz6uyYKLelovVrd9s6 X-Received: by 10.152.30.100 with SMTP id r4mr11221289lah.58.1417723771944; Thu, 04 Dec 2014 12:09:31 -0800 (PST) Received: from mirza-hm.lan (h39n9-klv-a11.ias.bredband.telia.com. [213.65.21.39]) by mx.google.com with ESMTPSA id ku11sm4901604lac.32.2014.12.04.12.09.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Dec 2014 12:09:30 -0800 (PST) From: Mirza Krak To: linux-spi@vger.kernel.org Cc: Mirza Krak Subject: [PATCH 1/1] spi: fsl-dspi: Fixes warning due to devm_kzalloc on unbound device Date: Thu, 4 Dec 2014 21:09:15 +0100 Message-Id: <1417723755-5372-1-git-send-email-mirza.krak@hostmobility.com> X-Mailer: git-send-email 1.9.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ------------[ cut here ]------------ WARNING: at drivers/base/dd.c:286 driver_probe_device+0x1b4/0x22c() Modules linked in: Backtrace: [<80011644>] (dump_backtrace) from [<800117e0>] (show_stack+0x18/0x1c) r6:0000011e r5:00000009 r4:00000000 r3:00000000 [<800117c8>] (show_stack) from [<805961e8>] (dump_stack+0x20/0x28) [<805961c8>] (dump_stack) from [<80020e48>] (warn_slowpath_common+0x6c/0x8c) [<80020ddc>] (warn_slowpath_common) from [<80020e8c>] (warn_slowpath_null+0x24/0x2c) r8:00000006 r7:7f005b94 r6:8ea1ae34 r5:8ea1ae00 r4:80837290 [<80020e68>] (warn_slowpath_null) from [<802d9078>] (driver_probe_device+0x1b4/0x22c) [<802d8ec4>] (driver_probe_device) from [<802d9184>] (__driver_attach+0x94/0x98) r8:7f00b000 r7:00000000 r6:8ea1ae34 r5:7f005b94 r4:8ea1ae00 r3:00000000 [<802d90f0>] (__driver_attach) from [<802d778c>] (bus_for_each_dev+0x5c/0x90) r6:802d90f0 r5:7f005b94 r4:00000000 r3:8ea120bc [<802d7730>] (bus_for_each_dev) from [<802d8acc>] (driver_attach+0x24/0x28) r6:807c8428 r5:8e335e80 r4:7f005b94 [<802d8aa8>] (driver_attach) from [<802d874c>] (bus_add_driver+0xdc/0x1d8) [<802d8670>] (bus_add_driver) from [<802d9814>] (driver_register+0x80/0xfc) r7:8e307d00 r6:8e307e00 r5:807a93d8 r4:7f005b94 [<802d9794>] (driver_register) from [<8034f410>] (spi_register_driver+0x4c/0x60) r5:807a93d8 r4:807a93d8 [<8034f3c4>] (spi_register_driver) from [<7f00b01c>] (mx4_io_init+0x1c/0x28 [spi_pic]) [<7f00b000>] (mx4_io_init [spi_pic]) from [<8000874c>] (do_one_initcall+0x88/0x1cc) [<800086c4>] (do_one_initcall) from [<800638ac>] (load_module+0x1634/0x1d10) r10:800611c0 r9:7f006174 r8:00000001 r7:8e307d00 r6:00000001 r5:7f006180 r4:8e12bf48 [<80062278>] (load_module) from [<80064068>] (SyS_init_module+0xe0/0xf4) r10:00000000 r9:8e12a000 r8:8000e9e4 r7:00000080 r6:00884008 r5:00884018 r4:0000cb5d [<80063f88>] (SyS_init_module) from [<8000e840>] (ret_fast_syscall+0x0/0x30) r6:7eee4e53 r5:7eee4e53 r4:0000cb5d ---[ end trace 9c516d4cef36cef3 ]--- Inspired by: 10aa5a35e34f ("SPI: fix over-eager devm_xxx() conversion") Signed-off-by: Mirza Krak --- drivers/spi/spi-fsl-dspi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 831ceb4..78509d6 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -342,7 +342,7 @@ static int dspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) /* Only alloc on first setup */ chip = spi_get_ctldata(spi); if (chip == NULL) { - chip = devm_kzalloc(&spi->dev, sizeof(struct chip_data), + chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); GFP_KERNEL); if (!chip) return -ENOMEM; @@ -382,6 +382,11 @@ static int dspi_setup(struct spi_device *spi) return dspi_setup_transfer(spi, NULL); } +static void dspi_cleanup(struct spi_device *spi) +{ + spi_bitbang_cleanup(spi); +} + static irqreturn_t dspi_interrupt(int irq, void *dev_id) { struct fsl_dspi *dspi = (struct fsl_dspi *)dev_id; @@ -465,6 +470,7 @@ static int dspi_probe(struct platform_device *pdev) dspi->bitbang.setup_transfer = dspi_setup_transfer; dspi->bitbang.txrx_bufs = dspi_txrx_transfer; dspi->bitbang.master->setup = dspi_setup; + dspi->bitbang.master->cleanup = dspi_cleanup; dspi->bitbang.master->dev.of_node = pdev->dev.of_node; master->mode_bits = SPI_CPOL | SPI_CPHA;