From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235])
 by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux))
 id 1XG4To-0001Ya-Ml
 for linux-mtd@lists.infradead.org; Sat, 09 Aug 2014 11:06:33 +0000
Received: by mail-pa0-f53.google.com with SMTP id rd3so8576853pab.40
 for <linux-mtd@lists.infradead.org>; Sat, 09 Aug 2014 04:06:11 -0700 (PDT)
Date: Sat, 9 Aug 2014 19:06:05 +0800
From: Huang Shijie <shijie8@gmail.com>
To: =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com>
Subject: Re: [PATCH 2/2] mtd: spi-nor: drop jedec_probe /helper/ function
Message-ID: <20140809110604.GB1674@localhost.localdomain>
References: <1407397622-9252-1-git-send-email-zajec5@gmail.com>
 <1407397622-9252-2-git-send-email-zajec5@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1407397622-9252-2-git-send-email-zajec5@gmail.com>
Cc: Brian Norris <computersforpeace@gmail.com>, linux-mtd@lists.infradead.org,
 David Woodhouse <David.Woodhouse@intel.com>,
 Artem Bityutskiy <dedekind1@gmail.com>
List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>,
 <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/>
List-Post: <mailto:linux-mtd@lists.infradead.org>
List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
 <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe>

On Thu, Aug 07, 2014 at 09:47:02AM +0200, Rafał Miłecki wrote:
> It's a one-liner doing no magic and its name may be confusing because
> it does not have to use JEDEC (e.g. when using alternative read_id).
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 06fe959..ef45177 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -660,11 +660,6 @@ static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor)
>  	return ERR_PTR(-ENODEV);
>  }
>  
> -static const struct spi_device_id *jedec_probe(struct spi_nor *nor)
> -{
> -	return nor->read_id(nor);
> -}
> -
>  static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
>  			size_t *retlen, u_char *buf)
>  {
> @@ -939,7 +934,7 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
>  	if (info->jedec_id) {
>  		const struct spi_device_id *jid;
>  
> -		jid = jedec_probe(nor);
> +		jid = nor->read_id(nor);
>  		if (IS_ERR(jid)) {
>  			return PTR_ERR(jid);
>  		} else if (jid != id) {
> -- 
> 1.8.4.5
Acked-by: Huang Shijie <shijie8@gmail.com>