From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753330AbZFPDcQ (ORCPT ); Mon, 15 Jun 2009 23:32:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752644AbZFPDcB (ORCPT ); Mon, 15 Jun 2009 23:32:01 -0400 Received: from gate.crashing.org ([63.228.1.57]:40004 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751959AbZFPDcA (ORCPT ); Mon, 15 Jun 2009 23:32:00 -0400 Subject: Re: [PATCH v2] drivers/hvc: add missing __devexit_p() From: Benjamin Herrenschmidt To: Mike Frysinger Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Andrew Morton In-Reply-To: <1242632661-16198-1-git-send-email-vapier@gentoo.org> References: <1242632521-15954-1-git-send-email-vapier@gentoo.org> <1242632661-16198-1-git-send-email-vapier@gentoo.org> Content-Type: text/plain Date: Tue, 16 Jun 2009 13:30:57 +1000 Message-Id: <1245123057.12400.53.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2009-05-18 at 03:44 -0400, Mike Frysinger wrote: > The remove function uses __devexit, so the .remove assignment needs > __devexit_p() to fix a build error with hotplug disabled. > > Signed-off-by: Mike Frysinger > CC: linuxppc-dev@ozlabs.org > --- > v2 Thanks. Andrew, I'm picking this one up. Cheers, Ben. > - include all hvc files > > drivers/char/hvc_iseries.c | 2 +- > drivers/char/hvc_vio.c | 2 +- > drivers/char/hvcs.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c > index 449727b..936d05b 100644 > --- a/drivers/char/hvc_iseries.c > +++ b/drivers/char/hvc_iseries.c > @@ -241,7 +241,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev) > static struct vio_driver hvc_vio_driver = { > .id_table = hvc_driver_table, > .probe = hvc_vio_probe, > - .remove = hvc_vio_remove, > + .remove = __devexit_p(hvc_vio_remove), > .driver = { > .name = hvc_driver_name, > .owner = THIS_MODULE, > diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c > index bd62dc8..c72b994 100644 > --- a/drivers/char/hvc_vio.c > +++ b/drivers/char/hvc_vio.c > @@ -113,7 +113,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev) > static struct vio_driver hvc_vio_driver = { > .id_table = hvc_driver_table, > .probe = hvc_vio_probe, > - .remove = hvc_vio_remove, > + .remove = __devexit_p(hvc_vio_remove), > .driver = { > .name = hvc_driver_name, > .owner = THIS_MODULE, > diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c > index c76bccf..2724d62 100644 > --- a/drivers/char/hvcs.c > +++ b/drivers/char/hvcs.c > @@ -868,7 +868,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev) > static struct vio_driver hvcs_vio_driver = { > .id_table = hvcs_driver_table, > .probe = hvcs_probe, > - .remove = hvcs_remove, > + .remove = __devexit_p(hvcs_remove), > .driver = { > .name = hvcs_driver_name, > .owner = THIS_MODULE,