# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.985.1.92 -> 1.985.1.93
# drivers/pnp/card.c 1.10 -> 1.11
# include/linux/pnp.h 1.17 -> 1.18
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/25 anton@samba.org 1.989
# Merge samba.org:/scratch/anton/linux-2.5
# into samba.org:/scratch/anton/tmp3
# --------------------------------------------
# 03/03/24 ambx1@neo.rr.com 1.985.1.93
# PnP Card Service Cleanups
#
# Moves probing code to a central location and matches when new cards are
# added instead of only when new drivers are added.
# --------------------------------------------
#
diff -Nru a/drivers/pnp/card.c b/drivers/pnp/card.c
--- a/drivers/pnp/card.c Tue Mar 25 21:45:17 2003
+++ b/drivers/pnp/card.c Tue Mar 25 21:45:17 2003
@@ -19,6 +19,7 @@
#include "base.h"
LIST_HEAD(pnp_cards);
+LIST_HEAD(pnp_card_drivers);
static const struct pnp_card_id * match_card(struct pnp_card_driver * drv, struct pnp_card * card)
@@ -32,21 +33,41 @@
return NULL;
}
-static void generic_card_remove(struct pnp_dev * dev)
+static void card_remove(struct pnp_dev * dev)
{
dev->card_link = NULL;
}
-
-static void generic_card_remove_first(struct pnp_dev * dev)
+
+static void card_remove_first(struct pnp_dev * dev)
{
struct pnp_card_driver * drv = to_pnp_card_driver(dev->driver);
if (!dev->card || !drv)
return;
if (drv->remove)
drv->remove(dev->card_link);
- drv->link.remove = &generic_card_remove;
+ drv->link.remove = &card_remove;
kfree(dev->card_link);
- generic_card_remove(dev);
+ card_remove(dev);
+}
+
+static int card_probe(struct pnp_card * card, struct pnp_card_driver * drv)
+{
+ const struct pnp_card_id *id = match_card(drv,card);
+ if (id) {
+ struct pnp_card_link * clink = pnp_alloc(sizeof(struct pnp_card_link));
+ if (!clink)
+ return 0;
+ clink->card = card;
+ clink->driver = drv;
+ if (drv->probe) {
+ if (drv->probe(clink, id)>=0)
+ return 1;
+ else
+ kfree(clink);
+ } else
+ return 1;
+ }
+ return 0;
}
/**
@@ -103,7 +124,7 @@
int pnp_add_card(struct pnp_card * card)
{
int error;
- struct list_head * pos;
+ struct list_head * pos, * temp;
if (!card || !card->protocol)
return -EINVAL;
@@ -112,6 +133,7 @@
card->dev.bus = NULL;
card->dev.release = &pnp_release_card;
error = device_register(&card->dev);
+
if (error == 0) {
spin_lock(&pnp_lock);
list_add_tail(&card->global_list, &pnp_cards);
@@ -125,6 +147,12 @@
struct pnp_dev *dev = card_to_pnp_dev(pos);
__pnp_add_device(dev);
}
+
+ /* match with card drivers */
+ list_for_each_safe(pos,temp,&pnp_card_drivers){
+ struct pnp_card_driver * drv = list_entry(pos, struct pnp_card_driver, global_list);
+ card_probe(card,drv);
+ }
} else
pnp_err("sysfs failure, card '%s' will be unavailable", card->dev.bus_id);
return error;
@@ -248,9 +276,9 @@
if (!drv)
return;
down_write(&dev->dev.bus->subsys.rwsem);
- drv->link.remove = &generic_card_remove;
+ drv->link.remove = &card_remove;
device_release_driver(&dev->dev);
- drv->link.remove = &generic_card_remove_first;
+ drv->link.remove = &card_remove_first;
up_write(&dev->dev.bus->subsys.rwsem);
}
@@ -268,25 +296,16 @@
drv->link.id_table = NULL; /* this will disable auto matching */
drv->link.flags = drv->flags;
drv->link.probe = NULL;
- drv->link.remove = &generic_card_remove_first;
+ drv->link.remove = &card_remove_first;
+ spin_lock(&pnp_lock);
+ list_add_tail(&drv->global_list, &pnp_card_drivers);
+ spin_unlock(&pnp_lock);
pnp_register_driver(&drv->link);
list_for_each_safe(pos,temp,&pnp_cards){
struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);
- const struct pnp_card_id *id = match_card(drv,card);
- if (id) {
- struct pnp_card_link * clink = pnp_alloc(sizeof(struct pnp_card_link));
- if (!clink)
- continue;
- clink->card = card;
- clink->driver = drv;
- if (drv->probe) {
- if (drv->probe(clink, id)>=0)
- count++;
- } else
- count++;
- }
+ count += card_probe(card,drv);
}
return count;
}
@@ -298,9 +317,10 @@
void pnp_unregister_card_driver(struct pnp_card_driver * drv)
{
+ spin_lock(&pnp_lock);
+ list_del(&drv->global_list);
+ spin_unlock(&pnp_lock);
pnp_unregister_driver(&drv->link);
-
- pnp_dbg("the card driver '%s' has been unregistered", drv->name);
}
EXPORT_SYMBOL(pnp_add_card);
diff -Nru a/include/linux/pnp.h b/include/linux/pnp.h
--- a/include/linux/pnp.h Tue Mar 25 21:45:17 2003
+++ b/include/linux/pnp.h Tue Mar 25 21:45:17 2003
@@ -315,6 +315,7 @@
#define to_pnp_driver(drv) container_of(drv, struct pnp_driver, driver)
struct pnp_card_driver {
+ struct list_head global_list;
char * name;
const struct pnp_card_id *id_table;
unsigned int flags;
-
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/
This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:22 EST