All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 03/20] ALSA: pxa2xx: remove __dev* attributes
       [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
@ 2012-12-06 17:35   ` Bill Pemberton
  2012-12-06 17:35 ` [PATCH 07/20] ALSA: parisc/harmony: " Bill Pemberton
                     ` (5 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Bill Pemberton @ 2012-12-06 17:35 UTC (permalink / raw)
  To: alsa-devel
  Cc: Eric Miao, tiwai, gregkh, Haojian Zhuang, perex, Russell King,
	linux-arm-kernel

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
---
 sound/arm/pxa2xx-ac97-lib.c | 2 +-
 sound/arm/pxa2xx-ac97.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 48d7c0a..6fc0ae9 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void)
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
 #endif
 
-int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
+int pxa2xx_ac97_hw_probe(struct platform_device *dev)
 {
 	int ret;
 	pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 4e1fda7..ec54be4 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
 #endif
 
-static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
+static int pxa2xx_ac97_probe(struct platform_device *dev)
 {
 	struct snd_card *card;
 	struct snd_ac97_bus *ac97_bus;
@@ -224,7 +224,7 @@ err_dev:
 	return ret;
 }
 
-static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
+static int pxa2xx_ac97_remove(struct platform_device *dev)
 {
 	struct snd_card *card = platform_get_drvdata(dev);
 
@@ -239,7 +239,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
 
 static struct platform_driver pxa2xx_ac97_driver = {
 	.probe		= pxa2xx_ac97_probe,
-	.remove		= __devexit_p(pxa2xx_ac97_remove),
+	.remove		= pxa2xx_ac97_remove,
 	.driver		= {
 		.name	= "pxa2xx-ac97",
 		.owner	= THIS_MODULE,
-- 
1.8.0.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 03/20] ALSA: pxa2xx: remove __dev* attributes
@ 2012-12-06 17:35   ` Bill Pemberton
  0 siblings, 0 replies; 12+ messages in thread
From: Bill Pemberton @ 2012-12-06 17:35 UTC (permalink / raw)
  To: linux-arm-kernel

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
---
 sound/arm/pxa2xx-ac97-lib.c | 2 +-
 sound/arm/pxa2xx-ac97.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 48d7c0a..6fc0ae9 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void)
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
 #endif
 
-int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
+int pxa2xx_ac97_hw_probe(struct platform_device *dev)
 {
 	int ret;
 	pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 4e1fda7..ec54be4 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
 #endif
 
-static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
+static int pxa2xx_ac97_probe(struct platform_device *dev)
 {
 	struct snd_card *card;
 	struct snd_ac97_bus *ac97_bus;
@@ -224,7 +224,7 @@ err_dev:
 	return ret;
 }
 
-static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
+static int pxa2xx_ac97_remove(struct platform_device *dev)
 {
 	struct snd_card *card = platform_get_drvdata(dev);
 
@@ -239,7 +239,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
 
 static struct platform_driver pxa2xx_ac97_driver = {
 	.probe		= pxa2xx_ac97_probe,
-	.remove		= __devexit_p(pxa2xx_ac97_remove),
+	.remove		= pxa2xx_ac97_remove,
 	.driver		= {
 		.name	= "pxa2xx-ac97",
 		.owner	= THIS_MODULE,
-- 
1.8.0.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 07/20] ALSA: parisc/harmony: remove __dev* attributes
       [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
  2012-12-06 17:35   ` Bill Pemberton
@ 2012-12-06 17:35 ` Bill Pemberton
  2012-12-06 17:35 ` [PATCH 09/20] ALSA: ad1889: " Bill Pemberton
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Bill Pemberton @ 2012-12-06 17:35 UTC (permalink / raw)
  To: alsa-devel; +Cc: tiwai, perex, gregkh, linux-parisc

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: linux-parisc@vger.kernel.org
---
 sound/parisc/harmony.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index f47f9e2..0e66ba4 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -856,7 +856,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = {
 		       HARMONY_GAIN_HE_SHIFT, 1, 0),
 };
 
-static void __devinit
+static void
 snd_harmony_mixer_reset(struct snd_harmony *h)
 {
 	harmony_mute(h);
@@ -865,7 +865,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)
 	harmony_unmute(h);
 }
 
-static int __devinit
+static int
 snd_harmony_mixer_init(struct snd_harmony *h)
 {
 	struct snd_card *card;
@@ -915,7 +915,7 @@ snd_harmony_dev_free(struct snd_device *dev)
 	return snd_harmony_free(h);
 }
 
-static int __devinit
+static int
 snd_harmony_create(struct snd_card *card, 
 		   struct parisc_device *padev, 
 		   struct snd_harmony **rchip)
@@ -972,7 +972,7 @@ free_and_ret:
 	return err;
 }
 
-static int __devinit
+static int
 snd_harmony_probe(struct parisc_device *padev)
 {
 	int err;
@@ -1012,7 +1012,7 @@ free_and_ret:
 	return err;
 }
 
-static int __devexit
+static int
 snd_harmony_remove(struct parisc_device *padev)
 {
 	snd_card_free(parisc_get_drvdata(padev));
@@ -1024,7 +1024,7 @@ static struct parisc_driver snd_harmony_driver = {
 	.name = "harmony",
 	.id_table = snd_harmony_devtable,
 	.probe = snd_harmony_probe,
-	.remove = __devexit_p(snd_harmony_remove),
+	.remove = snd_harmony_remove,
 };
 
 static int __init 
-- 
1.8.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 09/20] ALSA: ad1889: remove __dev* attributes
       [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
  2012-12-06 17:35   ` Bill Pemberton
  2012-12-06 17:35 ` [PATCH 07/20] ALSA: parisc/harmony: " Bill Pemberton
@ 2012-12-06 17:35 ` Bill Pemberton
  2012-12-06 17:35 ` [PATCH 13/20] ALSA: sound/ps3: " Bill Pemberton
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Bill Pemberton @ 2012-12-06 17:35 UTC (permalink / raw)
  To: alsa-devel; +Cc: tiwai, perex, gregkh, Thibaut Varene, linux-parisc

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Thibaut Varene <T-Bone@parisc-linux.org>
Cc: linux-parisc@vger.kernel.org
---
 sound/pci/ad1889.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index e672ff4..ad8a311 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -624,7 +624,7 @@ snd_ad1889_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __devinit
+static int
 snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm)
 {
 	int err;
@@ -747,7 +747,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe
 	snd_iprintf(buffer, "Resampler samplerate: %u Hz\n", reg);
 }
 
-static void __devinit
+static void
 snd_ad1889_proc_init(struct snd_ad1889 *chip)
 {
 	struct snd_info_entry *entry;
@@ -767,7 +767,7 @@ static struct ac97_quirk ac97_quirks[] = {
 	{ } /* terminator */
 };
 
-static void __devinit
+static void
 snd_ad1889_ac97_xinit(struct snd_ad1889 *chip)
 {
 	u16 reg;
@@ -805,7 +805,7 @@ snd_ad1889_ac97_free(struct snd_ac97 *ac97)
 	chip->ac97 = NULL;
 }
 
-static int __devinit
+static int
 snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override)
 {
 	int err;
@@ -878,7 +878,7 @@ snd_ad1889_dev_free(struct snd_device *device)
 	return snd_ad1889_free(chip);
 }
 
-static int __devinit
+static int
 snd_ad1889_init(struct snd_ad1889 *chip) 
 {
 	ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */
@@ -892,7 +892,7 @@ snd_ad1889_init(struct snd_ad1889 *chip)
 	return 0;
 }
 
-static int __devinit
+static int
 snd_ad1889_create(struct snd_card *card,
 		  struct pci_dev *pci,
 		  struct snd_ad1889 **rchip)
@@ -978,7 +978,7 @@ free_and_ret:
 	return err;
 }
 
-static int __devinit
+static int
 snd_ad1889_probe(struct pci_dev *pci,
 		 const struct pci_device_id *pci_id)
 {
@@ -1042,7 +1042,7 @@ free_and_ret:
 	return err;
 }
 
-static void __devexit
+static void
 snd_ad1889_remove(struct pci_dev *pci)
 {
 	snd_card_free(pci_get_drvdata(pci));
@@ -1059,7 +1059,7 @@ static struct pci_driver ad1889_pci_driver = {
 	.name = KBUILD_MODNAME,
 	.id_table = snd_ad1889_ids,
 	.probe = snd_ad1889_probe,
-	.remove = __devexit_p(snd_ad1889_remove),
+	.remove = snd_ad1889_remove,
 };
 
 module_pci_driver(ad1889_pci_driver);
-- 
1.8.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 13/20] ALSA: sound/ps3: remove __dev* attributes
       [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
                   ` (2 preceding siblings ...)
  2012-12-06 17:35 ` [PATCH 09/20] ALSA: ad1889: " Bill Pemberton
@ 2012-12-06 17:35 ` Bill Pemberton
  2012-12-06 22:24   ` Geoff Levand
       [not found] ` <1354815329-20221-21-git-send-email-wfp5p@virginia.edu>
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 12+ messages in thread
From: Bill Pemberton @ 2012-12-06 17:35 UTC (permalink / raw)
  To: alsa-devel; +Cc: cbe-oss-dev, tiwai, gregkh, perex, Geoff Levand, linuxppc-dev

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Geoff Levand <geoff@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: cbe-oss-dev@lists.ozlabs.org
---
 sound/ppc/snd_ps3.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 9b18b52..8c7dcbe 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -786,7 +786,7 @@ static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
 };
 
 
-static int __devinit snd_ps3_map_mmio(void)
+static int snd_ps3_map_mmio(void)
 {
 	the_card.mapped_mmio_vaddr =
 		ioremap(the_card.ps3_dev->m_region->bus_addr,
@@ -808,7 +808,7 @@ static void snd_ps3_unmap_mmio(void)
 	the_card.mapped_mmio_vaddr = NULL;
 }
 
-static int __devinit snd_ps3_allocate_irq(void)
+static int snd_ps3_allocate_irq(void)
 {
 	int ret;
 	u64 lpar_addr, lpar_size;
@@ -866,7 +866,7 @@ static void snd_ps3_free_irq(void)
 	ps3_irq_plug_destroy(the_card.irq_no);
 }
 
-static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
+static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
 {
 	uint64_t val;
 	int ret;
@@ -882,7 +882,7 @@ static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
 			ret);
 }
 
-static void __devinit snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
+static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
 {
 	/*
 	 * avsetting driver seems to never change the followings
@@ -906,7 +906,7 @@ static void __devinit snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
 		   PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT);
 }
 
-static int __devinit snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
+static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
 {
 	int ret;
 	pr_debug("%s: start\n", __func__);
@@ -928,7 +928,7 @@ static int __devinit snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
 	return ret;
 }
 
-static int __devinit snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
+static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
 {
 	int i, ret;
 	u64 lpar_addr, lpar_size;
-- 
1.8.0.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH 20/20] ALSA: snd-usb-caiaq: remove __dev* attributes
       [not found] ` <1354815329-20221-21-git-send-email-wfp5p@virginia.edu>
@ 2012-12-06 17:36   ` Daniel Mack
  0 siblings, 0 replies; 12+ messages in thread
From: Daniel Mack @ 2012-12-06 17:36 UTC (permalink / raw)
  To: Bill Pemberton; +Cc: tiwai, gregkh, alsa-devel

On 06.12.2012 18:35, Bill Pemberton wrote:
> CONFIG_HOTPLUG is going away as an option.  As result the __dev*
> markings will be going away.
> 
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit.
> 
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: Daniel Mack <zonque@gmail.com>

Acked-by: Daniel Mack <zonque@gmail.com>


Thanks!

Daniel


> ---
>  sound/usb/caiaq/control.c | 8 ++++----
>  sound/usb/caiaq/device.c  | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/sound/usb/caiaq/control.c b/sound/usb/caiaq/control.c
> index 00e5d0a..adb8d03 100644
> --- a/sound/usb/caiaq/control.c
> +++ b/sound/usb/caiaq/control.c
> @@ -137,7 +137,7 @@ static int control_put(struct snd_kcontrol *kcontrol,
>  	return 1;
>  }
>  
> -static struct snd_kcontrol_new kcontrol_template __devinitdata = {
> +static struct snd_kcontrol_new kcontrol_template = {
>  	.iface = SNDRV_CTL_ELEM_IFACE_HWDEP,
>  	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
>  	.index = 0,
> @@ -489,8 +489,8 @@ static struct caiaq_controller kontrols4_controller[] = {
>  	{ "LED: FX2: Mode",			133 | CNT_INTVAL },
>  };
>  
> -static int __devinit add_controls(struct caiaq_controller *c, int num,
> -				  struct snd_usb_caiaqdev *dev)
> +static int add_controls(struct caiaq_controller *c, int num,
> +			struct snd_usb_caiaqdev *dev)
>  {
>  	int i, ret;
>  	struct snd_kcontrol *kc;
> @@ -507,7 +507,7 @@ static int __devinit add_controls(struct caiaq_controller *c, int num,
>  	return 0;
>  }
>  
> -int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
> +int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
>  {
>  	int ret = 0;
>  
> diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
> index 7da0d0a..c828f81 100644
> --- a/sound/usb/caiaq/device.c
> +++ b/sound/usb/caiaq/device.c
> @@ -289,7 +289,7 @@ int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
>  					  tmp, sizeof(tmp));
>  }
>  
> -static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
> +static void setup_card(struct snd_usb_caiaqdev *dev)
>  {
>  	int ret;
>  	char val[4];
> @@ -407,7 +407,7 @@ static int create_card(struct usb_device *usb_dev,
>  	return 0;
>  }
>  
> -static int __devinit init_card(struct snd_usb_caiaqdev *dev)
> +static int init_card(struct snd_usb_caiaqdev *dev)
>  {
>  	char *c, usbpath[32];
>  	struct usb_device *usb_dev = dev->chip.dev;
> @@ -481,7 +481,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
>  	return 0;
>  }
>  
> -static int __devinit snd_probe(struct usb_interface *intf,
> +static int snd_probe(struct usb_interface *intf,
>  		     const struct usb_device_id *id)
>  {
>  	int ret;
> 

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 00/20] ALSA: remove __dev* attributes for retirement of HOTPLUG
       [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
                   ` (4 preceding siblings ...)
       [not found] ` <1354815329-20221-21-git-send-email-wfp5p@virginia.edu>
@ 2012-12-06 17:41 ` Takashi Iwai
       [not found]   ` <20121206174556.D585580213@viridian.itc.virginia.edu>
       [not found] ` <1354815329-20221-6-git-send-email-wfp5p@virginia.edu>
  6 siblings, 1 reply; 12+ messages in thread
From: Takashi Iwai @ 2012-12-06 17:41 UTC (permalink / raw)
  To: Bill Pemberton; +Cc: gregkh, alsa-devel

At Thu,  6 Dec 2012 12:35:09 -0500,
Bill Pemberton wrote:
> 
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit so that HOTPLUG can be retired.
> 
> Bill Pemberton (20):
>   ALSA: pci: remove __dev* attributes
>   ALSA: AACI: remove __dev* attributes
>   ALSA: pxa2xx: remove __dev* attributes
>   ALSA: atmel: remove __dev* attributes
>   ALSA: firewire-speakers: remove __dev* attributes
>   ALSA: mips: remove __dev* attributes
>   ALSA: parisc/harmony: remove __dev* attributes
>   ALSA: oss: remove __dev* attributes
>   ALSA: ad1889: remove __dev* attributes
>   ALSA: bt87X: remove __dev* attributes
>   ALSA: oxygen: remove __dev* attributes

Any reason the three above to be separate patches?

>   ALSA: isa: remove __dev* attributes
>   ALSA: sound/ps3: remove __dev* attributes
>   ALSA: ppc: remove __dev* attributes
>   ALSA: sh: remove __dev* attributes
>   ALSA: sparc: remove __dev* attributes
>   ALSA: at73c213: remove __dev* attributes
>   ALSA: drivers: remove __dev* attributes
>   ALSA: snd-usb-6fire: remove __dev* attributes
>   ALSA: snd-usb-caiaq: remove __dev* attributes

Also, these can be a single clean up for sound/usb/*...

It's no big matter, but I just wonder since I don't see a logic...


Takashi

>  sound/arm/aaci.c                         | 18 +++---
>  sound/arm/pxa2xx-ac97-lib.c              |  2 +-
>  sound/arm/pxa2xx-ac97.c                  |  6 +-
>  sound/atmel/abdac.c                      |  8 +--
>  sound/atmel/ac97c.c                      | 10 ++--
>  sound/drivers/aloop.c                    | 16 +++---
>  sound/drivers/dummy.c                    | 14 ++---
>  sound/drivers/ml403-ac97cr.c             | 10 ++--
>  sound/drivers/mpu401/mpu401.c            | 18 +++---
>  sound/drivers/mtpav.c                    | 14 ++---
>  sound/drivers/mts64.c                    | 40 +++++++-------
>  sound/drivers/pcsp/pcsp.c                | 14 ++---
>  sound/drivers/pcsp/pcsp_input.c          |  2 +-
>  sound/drivers/pcsp/pcsp_input.h          |  2 +-
>  sound/drivers/pcsp/pcsp_lib.c            |  2 +-
>  sound/drivers/pcsp/pcsp_mixer.c          | 10 ++--
>  sound/drivers/portman2x4.c               | 18 +++---
>  sound/drivers/serial-u16550.c            | 32 +++++------
>  sound/drivers/virmidi.c                  |  6 +-
>  sound/firewire/speakers.c                |  8 +--
>  sound/isa/ad1816a/ad1816a.c              | 18 +++---
>  sound/isa/ad1816a/ad1816a_lib.c          | 19 ++++---
>  sound/isa/ad1848/ad1848.c                |  8 +--
>  sound/isa/adlib.c                        |  8 +--
>  sound/isa/als100.c                       | 22 ++++----
>  sound/isa/azt2320.c                      | 26 ++++-----
>  sound/isa/cmi8328.c                      |  8 +--
>  sound/isa/cmi8330.c                      | 42 +++++++-------
>  sound/isa/cs423x/cs4231.c                |  8 +--
>  sound/isa/cs423x/cs4236.c                | 50 ++++++++---------
>  sound/isa/es1688/es1688.c                | 28 +++++-----
>  sound/isa/es18xx.c                       | 80 +++++++++++++--------------
>  sound/isa/galaxy/galaxy.c                | 26 ++++-----
>  sound/isa/gus/gusclassic.c               | 15 ++---
>  sound/isa/gus/gusextreme.c               | 24 ++++----
>  sound/isa/gus/gusmax.c                   | 16 +++---
>  sound/isa/gus/interwave.c                | 54 +++++++++---------
>  sound/isa/msnd/msnd.h                    |  2 +-
>  sound/isa/msnd/msnd_pinnacle.c           | 44 +++++++--------
>  sound/isa/msnd/msnd_pinnacle_mixer.c     |  2 +-
>  sound/isa/opl3sa2.c                      | 40 +++++++-------
>  sound/isa/opti9xx/miro.c                 | 68 +++++++++++------------
>  sound/isa/opti9xx/opti92x-ad1848.c       | 42 +++++++-------
>  sound/isa/sb/emu8000.c                   | 22 ++++----
>  sound/isa/sb/jazz16.c                    | 18 +++---
>  sound/isa/sb/sb16.c                      | 26 ++++-----
>  sound/isa/sb/sb8.c                       |  8 +--
>  sound/isa/sc6000.c                       | 38 ++++++-------
>  sound/isa/sscape.c                       | 32 +++++------
>  sound/isa/wavefront/wavefront.c          | 53 +++++++++---------
>  sound/isa/wavefront/wavefront_fx.c       |  2 +-
>  sound/isa/wavefront/wavefront_midi.c     |  2 +-
>  sound/isa/wavefront/wavefront_synth.c    | 14 ++---
>  sound/mips/au1x00.c                      |  4 +-
>  sound/mips/hal2.c                        | 14 ++---
>  sound/mips/sgio2audio.c                  | 28 +++++-----
>  sound/oss/ad1848.c                       |  2 +-
>  sound/oss/kahlua.c                       | 10 ++--
>  sound/parisc/harmony.c                   | 12 ++--
>  sound/pci/ad1889.c                       | 18 +++---
>  sound/pci/ak4531_codec.c                 | 10 ++--
>  sound/pci/ali5451/ali5451.c              | 32 +++++------
>  sound/pci/als300.c                       | 14 ++---
>  sound/pci/als4000.c                      | 12 ++--
>  sound/pci/asihpi/asihpi.c                | 55 +++++++++----------
>  sound/pci/asihpi/hpioctl.c               |  6 +-
>  sound/pci/asihpi/hpioctl.h               |  6 +-
>  sound/pci/atiixp.c                       | 32 +++++------
>  sound/pci/atiixp_modem.c                 | 20 +++----
>  sound/pci/au88x0/au88x0.c                | 10 ++--
>  sound/pci/au88x0/au88x0_a3d.c            |  6 +-
>  sound/pci/au88x0/au88x0_core.c           |  2 +-
>  sound/pci/au88x0/au88x0_eq.c             | 10 ++--
>  sound/pci/au88x0/au88x0_game.c           |  2 +-
>  sound/pci/au88x0/au88x0_mixer.c          |  2 +-
>  sound/pci/au88x0/au88x0_mpu401.c         |  2 +-
>  sound/pci/au88x0/au88x0_pcm.c            |  6 +-
>  sound/pci/aw2/aw2-alsa.c                 | 28 +++++-----
>  sound/pci/azt3328.c                      | 22 ++++----
>  sound/pci/bt87x.c                        | 22 ++++----
>  sound/pci/ca0106/ca0106_main.c           | 12 ++--
>  sound/pci/ca0106/ca0106_mixer.c          | 26 ++++-----
>  sound/pci/ca0106/ca0106_proc.c           |  2 +-
>  sound/pci/ca0106/ca_midi.c               |  2 +-
>  sound/pci/cmipci.c                       | 48 ++++++++--------
>  sound/pci/cs4281.c                       | 30 +++++-----
>  sound/pci/cs46xx/cs46xx.c                |  8 +--
>  sound/pci/cs46xx/cs46xx_lib.c            | 35 ++++++------
>  sound/pci/cs5530.c                       | 16 +++---
>  sound/pci/cs5535audio/cs5535audio.c      | 18 +++---
>  sound/pci/cs5535audio/cs5535audio.h      | 10 ++--
>  sound/pci/cs5535audio/cs5535audio_olpc.c | 10 ++--
>  sound/pci/cs5535audio/cs5535audio_pcm.c  |  2 +-
>  sound/pci/ctxfi/ctatc.c                  | 20 +++----
>  sound/pci/ctxfi/ctatc.h                  |  8 +--
>  sound/pci/ctxfi/cthardware.c             |  4 +-
>  sound/pci/ctxfi/cthw20k1.c               |  4 +-
>  sound/pci/ctxfi/cthw20k2.c               |  4 +-
>  sound/pci/ctxfi/xfi.c                    |  6 +-
>  sound/pci/echoaudio/echoaudio.c          | 46 ++++++++--------
>  sound/pci/echoaudio/echoaudio.h          |  4 +-
>  sound/pci/echoaudio/midi.c               |  4 +-
>  sound/pci/emu10k1/emu10k1.c              |  8 +--
>  sound/pci/emu10k1/emu10k1_main.c         |  4 +-
>  sound/pci/emu10k1/emu10k1x.c             | 29 +++++-----
>  sound/pci/emu10k1/emufx.c                | 25 +++++----
>  sound/pci/emu10k1/emumixer.c             | 22 ++++----
>  sound/pci/emu10k1/emumpu401.c            |  6 +-
>  sound/pci/emu10k1/emupcm.c               | 11 ++--
>  sound/pci/emu10k1/emuproc.c              |  2 +-
>  sound/pci/emu10k1/p16v.c                 |  8 +--
>  sound/pci/emu10k1/timer.c                |  2 +-
>  sound/pci/ens1370.c                      | 52 +++++++++---------
>  sound/pci/es1938.c                       | 20 +++----
>  sound/pci/es1968.c                       | 42 +++++++-------
>  sound/pci/fm801.c                        | 26 ++++-----
>  sound/pci/hda/hda_intel.c                | 48 ++++++++--------
>  sound/pci/ice1712/amp.c                  |  6 +-
>  sound/pci/ice1712/aureon.c               | 24 ++++----
>  sound/pci/ice1712/delta.c                | 42 +++++++-------
>  sound/pci/ice1712/ews.c                  | 28 +++++-----
>  sound/pci/ice1712/hoontech.c             | 26 ++++-----
>  sound/pci/ice1712/ice1712.c              | 94 ++++++++++++++++----------------
>  sound/pci/ice1712/ice1724.c              | 64 +++++++++++-----------
>  sound/pci/ice1712/juli.c                 | 26 ++++-----
>  sound/pci/ice1712/maya44.c               | 16 +++---
>  sound/pci/ice1712/phase.c                | 22 ++++----
>  sound/pci/ice1712/pontis.c               | 10 ++--
>  sound/pci/ice1712/prodigy192.c           | 12 ++--
>  sound/pci/ice1712/prodigy_hifi.c         | 20 +++----
>  sound/pci/ice1712/psc724.c               |  8 +--
>  sound/pci/ice1712/quartet.c              | 24 ++++----
>  sound/pci/ice1712/revo.c                 | 28 +++++-----
>  sound/pci/ice1712/se.c                   | 20 +++----
>  sound/pci/ice1712/vt1720_mobo.c          | 10 ++--
>  sound/pci/ice1712/wtm.c                  | 10 ++--
>  sound/pci/intel8x0.c                     | 56 +++++++++----------
>  sound/pci/intel8x0m.c                    | 30 +++++-----
>  sound/pci/korg1212/korg1212.c            | 12 ++--
>  sound/pci/lola/lola.c                    | 14 ++---
>  sound/pci/lola/lola_clock.c              |  2 +-
>  sound/pci/lola/lola_mixer.c              | 32 +++++------
>  sound/pci/lola/lola_pcm.c                |  4 +-
>  sound/pci/lola/lola_proc.c               |  2 +-
>  sound/pci/lx6464es/lx6464es.c            | 30 +++++-----
>  sound/pci/lx6464es/lx_core.c             |  2 +-
>  sound/pci/lx6464es/lx_core.h             |  2 +-
>  sound/pci/maestro3.c                     | 24 ++++----
>  sound/pci/mixart/mixart.c                | 12 ++--
>  sound/pci/nm256/nm256.c                  | 18 +++---
>  sound/pci/oxygen/oxygen.c                | 10 ++--
>  sound/pci/oxygen/virtuoso.c              | 10 ++--
>  sound/pci/oxygen/xonar_cs43xx.c          |  4 +-
>  sound/pci/oxygen/xonar_pcm179x.c         |  4 +-
>  sound/pci/oxygen/xonar_wm87x6.c          |  4 +-
>  sound/pci/pcxhr/pcxhr.c                  | 14 ++---
>  sound/pci/riptide/riptide.c              | 20 +++----
>  sound/pci/rme32.c                        | 10 ++--
>  sound/pci/rme96.c                        | 14 ++---
>  sound/pci/rme9652/hdsp.c                 | 14 ++---
>  sound/pci/rme9652/hdspm.c                | 41 +++++++-------
>  sound/pci/rme9652/rme9652.c              | 22 ++++----
>  sound/pci/sis7019.c                      | 16 +++---
>  sound/pci/sonicvibes.c                   | 37 +++++++------
>  sound/pci/trident/trident.c              |  8 +--
>  sound/pci/trident/trident_main.c         | 46 ++++++++--------
>  sound/pci/via82xx.c                      | 50 ++++++++---------
>  sound/pci/via82xx_modem.c                | 26 ++++-----
>  sound/pci/vx222/vx222.c                  | 14 ++---
>  sound/pci/ymfpci/ymfpci.c                | 12 ++--
>  sound/pci/ymfpci/ymfpci_main.c           | 44 ++++++++-------
>  sound/ppc/awacs.c                        | 54 +++++++++---------
>  sound/ppc/beep.c                         |  2 +-
>  sound/ppc/burgundy.c                     | 22 ++++----
>  sound/ppc/daca.c                         |  2 +-
>  sound/ppc/keywest.c                      |  4 +-
>  sound/ppc/pmac.c                         | 12 ++--
>  sound/ppc/powermac.c                     |  6 +-
>  sound/ppc/snd_ps3.c                      | 12 ++--
>  sound/ppc/tumbler.c                      | 16 +++---
>  sound/sh/aica.c                          | 13 ++---
>  sound/sh/sh_dac_audio.c                  | 10 ++--
>  sound/sparc/amd7930.c                    | 16 +++---
>  sound/sparc/cs4231.c                     | 38 ++++++-------
>  sound/sparc/dbri.c                       | 28 +++++-----
>  sound/spi/at73c213.c                     | 20 +++----
>  sound/usb/6fire/chip.c                   |  4 +-
>  sound/usb/6fire/comm.c                   |  2 +-
>  sound/usb/6fire/comm.h                   |  2 +-
>  sound/usb/6fire/control.c                |  8 +--
>  sound/usb/6fire/control.h                |  2 +-
>  sound/usb/6fire/firmware.h               |  2 +-
>  sound/usb/6fire/midi.c                   |  2 +-
>  sound/usb/6fire/midi.h                   |  2 +-
>  sound/usb/6fire/pcm.c                    |  8 +--
>  sound/usb/6fire/pcm.h                    |  2 +-
>  sound/usb/caiaq/control.c                |  8 +--
>  sound/usb/caiaq/device.c                 |  6 +-
>  198 files changed, 1794 insertions(+), 1785 deletions(-)
> 
> -- 
> 1.8.0.1
> 

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 05/20] ALSA: firewire-speakers: remove __dev* attributes
       [not found] ` <1354815329-20221-6-git-send-email-wfp5p@virginia.edu>
@ 2012-12-06 18:13   ` Clemens Ladisch
  0 siblings, 0 replies; 12+ messages in thread
From: Clemens Ladisch @ 2012-12-06 18:13 UTC (permalink / raw)
  To: Bill Pemberton; +Cc: tiwai, gregkh, alsa-devel

Bill Pemberton wrote:
> CONFIG_HOTPLUG is going away as an option.  As result the __dev*
> markings will be going away.
>
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit.
>
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: Clemens Ladisch <clemens@ladisch.de>

Acked-by: Clemens Ladisch <clemens@ladisch.de>
for all these (5,10,11):

>  sound/firewire/speakers.c        | 8 ++++----

>  sound/pci/bt87x.c                | 22 +++++++++++-----------

>  sound/pci/oxygen/oxygen.c        | 10 +++++-----
>  sound/pci/oxygen/virtuoso.c      | 10 +++++-----
>  sound/pci/oxygen/xonar_cs43xx.c  |  4 ++--
>  sound/pci/oxygen/xonar_pcm179x.c |  4 ++--
>  sound/pci/oxygen/xonar_wm87x6.c  |  4 ++--

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 13/20] ALSA: sound/ps3: remove __dev* attributes
  2012-12-06 17:35 ` [PATCH 13/20] ALSA: sound/ps3: " Bill Pemberton
@ 2012-12-06 22:24   ` Geoff Levand
  0 siblings, 0 replies; 12+ messages in thread
From: Geoff Levand @ 2012-12-06 22:24 UTC (permalink / raw)
  To: Bill Pemberton
  Cc: cbe-oss-dev, alsa-devel, tiwai, gregkh, perex, linuxppc-dev

On Thu, 2012-12-06 at 12:35 -0500, Bill Pemberton wrote:
> CONFIG_HOTPLUG is going away as an option.  As result the __dev*
> markings will be going away.
> 
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit.
> 
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: Geoff Levand <geoff@infradead.org>
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: cbe-oss-dev@lists.ozlabs.org
> ---
>  sound/ppc/snd_ps3.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Looks OK for PS3.

Acked-by: Geoff Levand <geoff@infradead.org>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 00/20] ALSA: remove __dev* attributes for retirement of HOTPLUG
       [not found]   ` <20121206174556.D585580213@viridian.itc.virginia.edu>
@ 2012-12-07  8:39     ` Takashi Iwai
  0 siblings, 0 replies; 12+ messages in thread
From: Takashi Iwai @ 2012-12-07  8:39 UTC (permalink / raw)
  To: Bill Pemberton; +Cc: gregkh, alsa-devel

At Thu, 06 Dec 2012 12:45:56 -0500,
Bill Pemberton wrote:
> 
> Takashi Iwai writes:
> > 
> > At Thu,  6 Dec 2012 12:35:09 -0500,
> > Bill Pemberton wrote:
> > > 
> > > Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> > > and __devexit so that HOTPLUG can be retired.
> > > 
> > > Bill Pemberton (20):
> > >   ALSA: pci: remove __dev* attributes
> > >   ALSA: AACI: remove __dev* attributes
> > >   ALSA: pxa2xx: remove __dev* attributes
> > >   ALSA: atmel: remove __dev* attributes
> > >   ALSA: firewire-speakers: remove __dev* attributes
> > >   ALSA: mips: remove __dev* attributes
> > >   ALSA: parisc/harmony: remove __dev* attributes
> > >   ALSA: oss: remove __dev* attributes
> > >   ALSA: ad1889: remove __dev* attributes
> > >   ALSA: bt87X: remove __dev* attributes
> > >   ALSA: oxygen: remove __dev* attributes
> > 
> > Any reason the three above to be separate patches?
> > 
> 
> They are separately listed in MAINTAINERS, so I broke them out for the
> appropriate Cc:'s.

Ah, understood.  In general, split isn't needed for a case like this.
Most of such trivial cleanup patches are applied at once to the
relevant codes in the whole subsystem.

In anyway, I applied all patches now.


thanks,

Takashi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 03/20] ALSA: pxa2xx: remove __dev* attributes
  2012-12-06 17:35   ` Bill Pemberton
@ 2012-12-08 16:24     ` Haojian Zhuang
  -1 siblings, 0 replies; 12+ messages in thread
From: Haojian Zhuang @ 2012-12-08 16:24 UTC (permalink / raw)
  To: Bill Pemberton
  Cc: alsa-devel, Eric Miao, tiwai, Greg KH, Russell King,
	linux-arm-kernel@lists.infradead.org

On Fri, Dec 7, 2012 at 1:35 AM, Bill Pemberton <wfp5p@virginia.edu> wrote:
> CONFIG_HOTPLUG is going away as an option.  As result the __dev*
> markings will be going away.
>
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit.
>
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>  sound/arm/pxa2xx-ac97-lib.c | 2 +-
>  sound/arm/pxa2xx-ac97.c     | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
> index 48d7c0a..6fc0ae9 100644
> --- a/sound/arm/pxa2xx-ac97-lib.c
> +++ b/sound/arm/pxa2xx-ac97-lib.c
> @@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void)
>  EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
>  #endif
>
> -int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
> +int pxa2xx_ac97_hw_probe(struct platform_device *dev)
>  {
>         int ret;
>         pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
> diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
> index 4e1fda7..ec54be4 100644
> --- a/sound/arm/pxa2xx-ac97.c
> +++ b/sound/arm/pxa2xx-ac97.c
> @@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
>  static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
>  #endif
>
> -static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
> +static int pxa2xx_ac97_probe(struct platform_device *dev)
>  {
>         struct snd_card *card;
>         struct snd_ac97_bus *ac97_bus;
> @@ -224,7 +224,7 @@ err_dev:
>         return ret;
>  }
>
> -static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
> +static int pxa2xx_ac97_remove(struct platform_device *dev)
>  {
>         struct snd_card *card = platform_get_drvdata(dev);
>
> @@ -239,7 +239,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
>
>  static struct platform_driver pxa2xx_ac97_driver = {
>         .probe          = pxa2xx_ac97_probe,
> -       .remove         = __devexit_p(pxa2xx_ac97_remove),
> +       .remove         = pxa2xx_ac97_remove,
>         .driver         = {
>                 .name   = "pxa2xx-ac97",
>                 .owner  = THIS_MODULE,
> --
> 1.8.0.1
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 03/20] ALSA: pxa2xx: remove __dev* attributes
@ 2012-12-08 16:24     ` Haojian Zhuang
  0 siblings, 0 replies; 12+ messages in thread
From: Haojian Zhuang @ 2012-12-08 16:24 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Dec 7, 2012 at 1:35 AM, Bill Pemberton <wfp5p@virginia.edu> wrote:
> CONFIG_HOTPLUG is going away as an option.  As result the __dev*
> markings will be going away.
>
> Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
> and __devexit.
>
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> ---
>  sound/arm/pxa2xx-ac97-lib.c | 2 +-
>  sound/arm/pxa2xx-ac97.c     | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
> index 48d7c0a..6fc0ae9 100644
> --- a/sound/arm/pxa2xx-ac97-lib.c
> +++ b/sound/arm/pxa2xx-ac97-lib.c
> @@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void)
>  EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
>  #endif
>
> -int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
> +int pxa2xx_ac97_hw_probe(struct platform_device *dev)
>  {
>         int ret;
>         pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
> diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
> index 4e1fda7..ec54be4 100644
> --- a/sound/arm/pxa2xx-ac97.c
> +++ b/sound/arm/pxa2xx-ac97.c
> @@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
>  static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
>  #endif
>
> -static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
> +static int pxa2xx_ac97_probe(struct platform_device *dev)
>  {
>         struct snd_card *card;
>         struct snd_ac97_bus *ac97_bus;
> @@ -224,7 +224,7 @@ err_dev:
>         return ret;
>  }
>
> -static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
> +static int pxa2xx_ac97_remove(struct platform_device *dev)
>  {
>         struct snd_card *card = platform_get_drvdata(dev);
>
> @@ -239,7 +239,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
>
>  static struct platform_driver pxa2xx_ac97_driver = {
>         .probe          = pxa2xx_ac97_probe,
> -       .remove         = __devexit_p(pxa2xx_ac97_remove),
> +       .remove         = pxa2xx_ac97_remove,
>         .driver         = {
>                 .name   = "pxa2xx-ac97",
>                 .owner  = THIS_MODULE,
> --
> 1.8.0.1
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2012-12-08 16:24 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1354815329-20221-1-git-send-email-wfp5p@virginia.edu>
2012-12-06 17:35 ` [PATCH 03/20] ALSA: pxa2xx: remove __dev* attributes Bill Pemberton
2012-12-06 17:35   ` Bill Pemberton
2012-12-08 16:24   ` Haojian Zhuang
2012-12-08 16:24     ` Haojian Zhuang
2012-12-06 17:35 ` [PATCH 07/20] ALSA: parisc/harmony: " Bill Pemberton
2012-12-06 17:35 ` [PATCH 09/20] ALSA: ad1889: " Bill Pemberton
2012-12-06 17:35 ` [PATCH 13/20] ALSA: sound/ps3: " Bill Pemberton
2012-12-06 22:24   ` Geoff Levand
     [not found] ` <1354815329-20221-21-git-send-email-wfp5p@virginia.edu>
2012-12-06 17:36   ` [PATCH 20/20] ALSA: snd-usb-caiaq: " Daniel Mack
2012-12-06 17:41 ` [PATCH 00/20] ALSA: remove __dev* attributes for retirement of HOTPLUG Takashi Iwai
     [not found]   ` <20121206174556.D585580213@viridian.itc.virginia.edu>
2012-12-07  8:39     ` Takashi Iwai
     [not found] ` <1354815329-20221-6-git-send-email-wfp5p@virginia.edu>
2012-12-06 18:13   ` [PATCH 05/20] ALSA: firewire-speakers: remove __dev* attributes Clemens Ladisch

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.