mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pcmcia: dev_node removal (core) 

Remove the dev_node declaration. We now only pass the device name
to the deprecated userspace tools.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2010-03-20 19:43:40 +01:00
parent b498ada6d0
commit b9300aa744
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/pcmcia/driver-changes.txt
View File

@ -1,4 +1,7 @@
This file details changes in 2.6 which affect PCMCIA card driver authors: This file details changes in 2.6 which affect PCMCIA card driver authors:
* No dev_node_t (as of 2.6.35)
There is no more need to fill out a "dev_node_t" structure.
* New IRQ request rules (as of 2.6.35) * New IRQ request rules (as of 2.6.35)
Instead of the old pcmcia_request_irq() interface, drivers may now Instead of the old pcmcia_request_irq() interface, drivers may now
choose between: choose between:

2
drivers/pcmcia/ds.c
View File

@ -371,8 +371,6 @@ static int pcmcia_device_remove(struct device *dev)
if (p_drv->remove) if (p_drv->remove)
p_drv->remove(p_dev); p_drv->remove(p_dev);
p_dev->dev_node = NULL;
/* check for proper unloading */ /* check for proper unloading */
if (p_dev->_irq || p_dev->_io || p_dev->_locked) if (p_dev->_irq || p_dev->_io || p_dev->_locked)
dev_printk(KERN_INFO, dev, dev_printk(KERN_INFO, dev,

15
drivers/pcmcia/pcmcia_ioctl.c
View File

@ -571,7 +571,6 @@ static struct pci_bus *pcmcia_lookup_bus(struct pcmcia_socket *s)
static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first) static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first)
{ {
dev_node_t *node;
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
struct pcmcia_driver *p_drv; struct pcmcia_driver *p_drv;
int ret = 0; int ret = 0;
@ -633,21 +632,13 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
goto err_put; goto err_put;
} }
if (first) if (!first) {
node = p_dev->dev_node;
else
for (node = p_dev->dev_node; node; node = node->next)
if (node == bind_info->next)
break;
if (!node) {
ret = -ENODEV; ret = -ENODEV;
goto err_put; goto err_put;
} }
strlcpy(bind_info->name, node->dev_name, DEV_NAME_LEN); strlcpy(bind_info->name, dev_name(&p_dev->dev), DEV_NAME_LEN);
bind_info->major = node->major; bind_info->next = NULL;
bind_info->minor = node->minor;
bind_info->next = node->next;
err_put: err_put:
pcmcia_put_dev(p_dev); pcmcia_put_dev(p_dev);

10
include/pcmcia/ds.h
View File

@ -62,15 +62,6 @@ struct pcmcia_driver {
int pcmcia_register_driver(struct pcmcia_driver *driver); int pcmcia_register_driver(struct pcmcia_driver *driver);
void pcmcia_unregister_driver(struct pcmcia_driver *driver); void pcmcia_unregister_driver(struct pcmcia_driver *driver);
/* Some drivers use dev_node_t to store char or block device information.
* Don't use this in new drivers, though.
*/
typedef struct dev_node_t {
char dev_name[DEV_NAME_LEN];
u_short major, minor;
struct dev_node_t *next;
} dev_node_t;
struct pcmcia_device { struct pcmcia_device {
/* the socket and the device_no [for multifunction devices] /* the socket and the device_no [for multifunction devices]
uniquely define a pcmcia_device */ uniquely define a pcmcia_device */
@ -88,7 +79,6 @@ struct pcmcia_device {
struct list_head socket_device_list; struct list_head socket_device_list;
/* deprecated, will be cleaned up soon */ /* deprecated, will be cleaned up soon */
dev_node_t *dev_node;
u_int open; u_int open;
io_req_t io; io_req_t io;
config_req_t conf; config_req_t conf;