From patchwork Wed May 30 22:15:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 923067 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lunn.ch Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=lunn.ch header.i=@lunn.ch header.b="uUf4Bxv3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40x4gV3Wzpz9ry1 for ; Thu, 31 May 2018 08:16:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932541AbeE3WQU (ORCPT ); Wed, 30 May 2018 18:16:20 -0400 Received: from vps0.lunn.ch ([185.16.172.187]:50153 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932447AbeE3WQS (ORCPT ); Wed, 30 May 2018 18:16:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Message-Id:Date:Subject:Cc:To:From; bh=erARDK40Q3gfdkEaiY1EBEJtGyjr5yCCoy6z5v5U+JE=; b=uUf4Bxv3dputEeV6UTYlzhNE8oAVBPBjB0n+L43XvGXOLP1Sw9EbVb1+CAZG6EljEj4HbAgEFgiznYWJaNjU6VR8J6ii2KnYt9oowzpYckAS76AAL3A7oThgXTjJYStqFfUm02ViE7m5lqlINj4o/9qxTxw9IubElygDPmCGyCg=; Received: from andrew by vps0.lunn.ch with local (Exim 4.84_2) (envelope-from ) id 1fO9Np-0005u3-F2; Thu, 31 May 2018 00:15:53 +0200 From: Andrew Lunn To: David Miller Cc: Vivien Didelot , Florian Fainelli , dan.carpenter@oracle.com, netdev , Andrew Lunn Subject: [PATCH net-next] net: dsa: mv88e6xxx: Be explicit about DT or pdata Date: Thu, 31 May 2018 00:15:42 +0200 Message-Id: <1527718542-22658-1-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make it explicit that either device tree is used or platform data. If neither is available, abort the probe. Reported-by: Dan Carpenter Fixes: 877b7cb0b6f2 ("net: dsa: mv88e6xxx: Add minimal platform_data support") Signed-off-by: Andrew Lunn Reviewed-by: Vivien Didelot Reviewed-by: Florian Fainelli --- drivers/net/dsa/mv88e6xxx/chip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 12df00f593b7..437cd6eb4faa 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4389,6 +4389,9 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) int port; int err; + if (!np && !pdata) + return -EINVAL; + if (np) compat_info = of_device_get_match_data(dev);