Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753406AbbGaTmv (ORCPT ); Fri, 31 Jul 2015 15:42:51 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45713 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965AbbGaTmg (ORCPT ); Fri, 31 Jul 2015 15:42:36 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Ricard , Samuel Ortiz Subject: [PATCH 4.1 045/267] NFC: st21nfcb: remove st21nfcb_nci_i2c_disable Date: Fri, 31 Jul 2015 12:38:16 -0700 Message-Id: <20150731194003.337058528@linuxfoundation.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <20150731194001.933895871@linuxfoundation.org> References: <20150731194001.933895871@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1032 Lines: 38 4.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe Ricard commit 4ac82e894825126816d7b7f662743335ce2b015e upstream. ndlc_remove already calls st21nfcb_nci_i2c_disable and phy->powered is already set to 0. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/st21nfcb/i2c.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c @@ -359,9 +359,6 @@ static int st21nfcb_nci_i2c_remove(struc ndlc_remove(phy->ndlc); - if (phy->powered) - st21nfcb_nci_i2c_disable(phy); - return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/