Merge branch 'master' into upstream

Conflicts:

	drivers/net/netxen/netxen_nic.h
	drivers/net/netxen/netxen_nic_main.c

10 files changed, 38 insertions, 80 deletions

diff --git a/sound/aoa/aoa-gpio.h b/sound/aoa/aoa-gpio.h
index 3a61f3115573..ee64f5de8966 100644
--- a/sound/aoa/aoa-gpio.h
+++ b/sound/aoa/aoa-gpio.h
@@ -59,10 +59,10 @@ struct gpio_methods {
 };
 
 struct gpio_notification {
+        struct delayed_work work;
         notify_func_t notify;
         void *data;
         void *gpio_private;
-        struct work_struct work;
         struct mutex mutex;
 };
 
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c
index 40eb47eccf9a..2b03bc798bcb 100644
--- a/sound/aoa/core/snd-aoa-gpio-feature.c
+++ b/sound/aoa/core/snd-aoa-gpio-feature.c
@@ -195,9 +195,10 @@ static void ftr_gpio_all_amps_restore(struct gpio_runtime *rt)
         ftr_gpio_set_lineout(rt, (s>>2)&1);
 }
 
-static void ftr_handle_notify(void *data)
+static void ftr_handle_notify(struct work_struct *work)
 {
-        struct gpio_notification *notif = data;
+        struct gpio_notification *notif =
+                container_of(work, struct gpio_notification, work.work);
 
         mutex_lock(&notif->mutex);
         if (notif->notify)
@@ -253,12 +254,9 @@ static void ftr_gpio_init(struct gpio_runtime *rt)
 
         ftr_gpio_all_amps_off(rt);
         rt->implementation_private = 0;
-        INIT_WORK(&rt->headphone_notify.work, ftr_handle_notify,
-                  &rt->headphone_notify);
-        INIT_WORK(&rt->line_in_notify.work, ftr_handle_notify,
-                  &rt->line_in_notify);
-        INIT_WORK(&rt->line_out_notify.work, ftr_handle_notify,
-                  &rt->line_out_notify);
+        INIT_DELAYED_WORK(&rt->headphone_notify.work, ftr_handle_notify);
+        INIT_DELAYED_WORK(&rt->line_in_notify.work, ftr_handle_notify);
+        INIT_DELAYED_WORK(&rt->line_out_notify.work, ftr_handle_notify);
         mutex_init(&rt->headphone_notify.mutex);
         mutex_init(&rt->line_in_notify.mutex);
         mutex_init(&rt->line_out_notify.mutex);
@@ -287,7 +285,7 @@ static irqreturn_t ftr_handle_notify_irq(int xx, void *data)
 {
         struct gpio_notification *notif = data;
 
-        schedule_work(&notif->work);
+        schedule_delayed_work(&notif->work, 0);
 
         return IRQ_HANDLED;
 }
diff --git a/sound/aoa/core/snd-aoa-gpio-pmf.c b/sound/aoa/core/snd-aoa-gpio-pmf.c
index 2836c3218391..5ca2220eac7d 100644
--- a/sound/aoa/core/snd-aoa-gpio-pmf.c
+++ b/sound/aoa/core/snd-aoa-gpio-pmf.c
@@ -69,9 +69,10 @@ static void pmf_gpio_all_amps_restore(struct gpio_runtime *rt)
         pmf_gpio_set_lineout(rt, (s>>2)&1);
 }
 
-static void pmf_handle_notify(void *data)
+static void pmf_handle_notify(struct work_struct *work)
 {
-        struct gpio_notification *notif = data;
+        struct gpio_notification *notif =
+                container_of(work, struct gpio_notification, work.work);
 
         mutex_lock(&notif->mutex);
         if (notif->notify)
@@ -83,12 +84,9 @@ static void pmf_gpio_init(struct gpio_runtime *rt)
 {
         pmf_gpio_all_amps_off(rt);
         rt->implementation_private = 0;
-        INIT_WORK(&rt->headphone_notify.work, pmf_handle_notify,
-                  &rt->headphone_notify);
-        INIT_WORK(&rt->line_in_notify.work, pmf_handle_notify,
-                  &rt->line_in_notify);
-        INIT_WORK(&rt->line_out_notify.work, pmf_handle_notify,
-                  &rt->line_out_notify);
+        INIT_DELAYED_WORK(&rt->headphone_notify.work, pmf_handle_notify);
+        INIT_DELAYED_WORK(&rt->line_in_notify.work, pmf_handle_notify);
+        INIT_DELAYED_WORK(&rt->line_out_notify.work, pmf_handle_notify);
         mutex_init(&rt->headphone_notify.mutex);
         mutex_init(&rt->line_in_notify.mutex);
         mutex_init(&rt->line_out_notify.mutex);
@@ -129,7 +127,7 @@ static void pmf_handle_notify_irq(void *data)
 {
         struct gpio_notification *notif = data;
 
-        schedule_work(&notif->work);
+        schedule_delayed_work(&notif->work, 0);
 }
 
 static int pmf_set_notify(struct gpio_runtime *rt,
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 12ffffc9e814..d2f2c5078e65 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -35,7 +35,7 @@ MODULE_LICENSE("GPL");
 
 #define AK4114_ADDR                     0x00 /* fixed address */
 
-static void ak4114_stats(void *);
+static void ak4114_stats(struct work_struct *work);
 
 static void reg_write(struct ak4114 *ak4114, unsigned char reg, unsigned char val)
 {
@@ -158,7 +158,7 @@ void snd_ak4114_reinit(struct ak4114 *chip)
         reg_write(chip, AK4114_REG_PWRDN, old | AK4114_RST | AK4114_PWN);
         /* bring up statistics / event queing */
         chip->init = 0;
-        INIT_WORK(&chip->work, ak4114_stats, chip);
+        INIT_DELAYED_WORK(&chip->work, ak4114_stats);
         queue_delayed_work(chip->workqueue, &chip->work, HZ / 10);
 }
 
@@ -561,9 +561,9 @@ int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)
         return res;
 }
 
-static void ak4114_stats(void *data)
+static void ak4114_stats(struct work_struct *work)
 {
-        struct ak4114 *chip = (struct ak4114 *)data;
+        struct ak4114 *chip = container_of(work, struct ak4114, work.work);
 
         if (chip->init)
                 return;
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 6577b2325357..7abcb10b2754 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1927,9 +1927,10 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
 static struct snd_ac97_build_ops null_build_ops;
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-static void do_update_power(void *data)
+static void do_update_power(struct work_struct *work)
 {
-        update_power_regs(data);
+        update_power_regs(
+                container_of(work, struct snd_ac97, power_work.work));
 }
 #endif
 
@@ -1989,7 +1990,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
         mutex_init(&ac97->page_mutex);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
         ac97->power_workq = create_workqueue("ac97");
-        INIT_WORK(&ac97->power_work, do_update_power, ac97);
+        INIT_DELAYED_WORK(&ac97->power_work, do_update_power);
 #endif
 
 #ifdef CONFIG_PCI
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9c3d7ac08068..71482c15a852 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -272,10 +272,11 @@ EXPORT_SYMBOL(snd_hda_queue_unsol_event);
 /*
  * process queueud unsolicited events
  */
-static void process_unsol_events(void *data)
+static void process_unsol_events(struct work_struct *work)
 {
-        struct hda_bus *bus = data;
-        struct hda_bus_unsolicited *unsol = bus->unsol;
+        struct hda_bus_unsolicited *unsol =
+                container_of(work, struct hda_bus_unsolicited, work);
+        struct hda_bus *bus = unsol->bus;
         struct hda_codec *codec;
         unsigned int rp, caddr, res;
 
@@ -314,7 +315,8 @@ static int init_unsol_queue(struct hda_bus *bus)
                 kfree(unsol);
                 return -ENOMEM;
         }
-        INIT_WORK(&unsol->work, process_unsol_events, bus);
+        INIT_WORK(&unsol->work, process_unsol_events);
+        unsol->bus = bus;
         bus->unsol = unsol;
         return 0;
 }
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index f9416c36396e..9ca1baf860bd 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -206,6 +206,7 @@ struct hda_bus_unsolicited {
         /* workqueue */
         struct workqueue_struct *workq;
         struct work_struct work;
+        struct hda_bus *bus;
 };
 
 /*
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index fd3590fcaedb..2d40cc72f236 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -219,35 +219,15 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 static int pdacf_config(struct pcmcia_device *link)
 {
         struct snd_pdacf *pdacf = link->priv;
-        tuple_t tuple;
-        cisparse_t *parse = NULL;
-        u_short buf[32];
         int last_fn, last_ret;
 
         snd_printdd(KERN_DEBUG "pdacf_config called\n");
-        parse = kmalloc(sizeof(*parse), GFP_KERNEL);
-        if (! parse) {
-                snd_printk(KERN_ERR "pdacf_config: cannot allocate\n");
-                return -ENOMEM;
-        }
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        tuple.Attributes = 0;
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse));
-        link->conf.ConfigBase = parse->config.base;
         link->conf.ConfigIndex = 0x5;
 
         CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
         CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
-        kfree(parse);
-
         if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0)
                 goto failed;
 
@@ -255,7 +235,6 @@ static int pdacf_config(struct pcmcia_device *link)
         return 0;
 
 cs_failed:
-        kfree(parse);
         cs_error(link, last_fn, last_ret);
 failed:
         pcmcia_disable_device(link);
@@ -299,7 +278,8 @@ static int pdacf_resume(struct pcmcia_device *link)
  * Module entry points
  */
 static struct pcmcia_device_id snd_pdacf_ids[] = {
-        PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45),
+        /* this is too general PCMCIA_DEVICE_MANF_CARD(0x015d, 0x4c45), */
+        PCMCIA_DEVICE_PROD_ID12("Core Sound","PDAudio-CF",0x396d19d2,0x71717b49),
         PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 3089fcca800e..d7df59e9c647 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -217,34 +217,12 @@ static int vxpocket_config(struct pcmcia_device *link)
 {
         struct vx_core *chip = link->priv;
         struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip;
-        tuple_t tuple;
-        cisparse_t *parse;
-        u_short buf[32];
         int last_fn, last_ret;
 
         snd_printdd(KERN_DEBUG "vxpocket_config called\n");
-        parse = kmalloc(sizeof(*parse), GFP_KERNEL);
-        if (! parse) {
-                snd_printk(KERN_ERR "vx: cannot allocate\n");
-                return -ENOMEM;
-        }
-        tuple.Attributes = 0;
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse));
-        link->conf.ConfigBase = parse->config.base;
-        link->conf.Present = parse->config.rmask[0];
 
         /* redefine hardware record according to the VERSION1 string */
-        tuple.DesiredTuple = CISTPL_VERS_1;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse));
-        if (! strcmp(parse->version_1.str + parse->version_1.ofs[1], "VX-POCKET")) {
+        if (!strcmp(link->prod_id[1], "VX-POCKET")) {
                 snd_printdd("VX-pocket is detected\n");
         } else {
                 snd_printdd("VX-pocket 440 is detected\n");
@@ -265,14 +243,12 @@ static int vxpocket_config(struct pcmcia_device *link)
                 goto failed;
 
         link->dev_node = &vxp->node;
-        kfree(parse);
         return 0;
 
 cs_failed:
         cs_error(link, last_fn, last_ret);
 failed:
         pcmcia_disable_device(link);
-        kfree(parse);
         return -ENODEV;
 }
 
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 2fbe1d183fce..8f074c7936e6 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -942,10 +942,11 @@ static void check_mute(struct snd_pmac *chip, struct pmac_gpio *gp, int val, int
 }
 
 static struct work_struct device_change;
+static struct snd_pmac *device_change_chip;
 
-static void device_change_handler(void *self)
+static void device_change_handler(struct work_struct *work)
 {
-        struct snd_pmac *chip = self;
+        struct snd_pmac *chip = device_change_chip;
         struct pmac_tumbler *mix;
         int headphone, lineout;
 
@@ -1417,7 +1418,8 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
         chip->resume = tumbler_resume;
 #endif
 
-        INIT_WORK(&device_change, device_change_handler, (void *)chip);
+        INIT_WORK(&device_change, device_change_handler);
+        device_change_chip = chip;
 
 #ifdef PMAC_SUPPORT_AUTOMUTE
         if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0)