From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bhutchings@solarflare.com>
Received: from ocex02.SolarFlarecom.com (unknown [216.237.3.220])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (Client CN "WEBMAIL.SOLARFLARE.COM",
 Issuer "VeriSign Class 3 Secure Server CA - G3" (not verified))
 by ozlabs.org (Postfix) with ESMTPS id A0C4EB6FC5
 for <linuxppc-dev@lists.ozlabs.org>; Tue, 28 Feb 2012 07:03:21 +1100 (EST)
Message-ID: <1330372595.2720.1.camel@bwh-desktop>
Subject: Re: [PATCH net-next] ibm emac: delete module references; phy.c only
 supported as built-in
From: Ben Hutchings <bhutchings@solarflare.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 27 Feb 2012 19:56:35 +0000
In-Reply-To: <1330372024-30974-1-git-send-email-paul.gortmaker@windriver.com>
References: <1330372024-30974-1-git-send-email-paul.gortmaker@windriver.com>
Content-Type: text/plain; charset="UTF-8"
MIME-Version: 1.0
Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>

On Mon, 2012-02-27 at 14:47 -0500, Paul Gortmaker wrote:
> The Makefile has it as "ibm_emac-y := mal.o core.o phy.o" so there is
> no way this can be built modular, so remove all references to module
> support.

No, that's nonsense.  You need to look at whether ibm_emac.o can be
added to obj-m (which it can).

Ben.

> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> diff --git a/drivers/net/ethernet/ibm/emac/phy.c b/drivers/net/ethernet/ibm/emac/phy.c
> index d3b9d10..fb96387 100644
> --- a/drivers/net/ethernet/ibm/emac/phy.c
> +++ b/drivers/net/ethernet/ibm/emac/phy.c
> @@ -11,13 +11,15 @@
>   * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
>   *                <benh@kernel.crashing.org>
>   *
> + * Originally listed as MODULE_LICENSE("GPL") in the code, but that
> + * was removed, since this code is only supported as non-modular.
> + *
>   * Based on the arch/ppc version of the driver:
>   *
>   * (c) 2003, Benjamin Herrenscmidt (benh@kernel.crashing.org)
>   * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net>
>   *
>   */
> -#include <linux/module.h>
>  #include <linux/kernel.h>
>  #include <linux/types.h>
>  #include <linux/netdevice.h>
> @@ -537,5 +539,3 @@ int emac_mii_phy_probe(struct mii_phy *phy, int address)
>  
>  	return 0;
>  }
> -
> -MODULE_LICENSE("GPL");

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.