Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fe8252f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: fix build errors: uevent with CONFIG_SYSFS=n
  pcmcia: some class_device fallout
  Driver core: device_add_attrs() cleanup
  debugfs: Remove misleading comments.
  debugfs: implement symbolic links
  Driver: remove redundant kobject_unregister checks
  kobject: kobj->k_name verification fix
  serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
  Driver core: let request_module() send a /sys/modules/kmod/-uevent
  Driver.h copyright update
parents 460223d2 ef665c1a

drivers/base/bus.c

+10 −12
Original line number Diff line number Diff line
@@ -329,22 +329,20 @@ static int device_add_attrs(struct bus_type * bus, struct device * dev) 
	int error = 0;

	int i;



	if (bus->dev_attrs) {

	if (!bus->dev_attrs)

		return 0;



	for (i = 0; attr_name(bus->dev_attrs[i]); i++) {

		error = device_create_file(dev,&bus->dev_attrs[i]);

			if (error)

				goto Err;

		if (error) {

			while (--i >= 0)

				device_remove_file(dev, &bus->dev_attrs[i]);

			break;

		}

	}

 Done:

	return error;

 Err:

	while (--i >= 0)

		device_remove_file(dev,&bus->dev_attrs[i]);

	goto Done;

}





static void device_remove_attrs(struct bus_type * bus, struct device * dev)

{

	int i;

drivers/base/class.c

+1 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ int class_register(struct class * cls) 
void class_unregister(struct class * cls)

{

	pr_debug("device class '%s': unregistering\n", cls->name);

	if (cls->virtual_dir)

	kobject_unregister(cls->virtual_dir);

	remove_class_attrs(cls);

	subsystem_unregister(&cls->subsys);

drivers/pcmcia/at91_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int __init at91_cf_probe(struct platform_device *pdev) 
		board->det_pin, board->irq_pin);



	cf->socket.owner = THIS_MODULE;

	cf->socket.dev.dev = &pdev->dev;

	cf->socket.dev.parent = &pdev->dev;

	cf->socket.ops = &at91_cf_ops;

	cf->socket.resource_ops = &pccard_static_ops;

	cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP

drivers/pcmcia/soc_common.c

+4 −4
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, i 
 *

 * Returns: the number of characters added to the buffer

 */

static ssize_t show_status(struct device *dev, char *buf)

static ssize_t show_status(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct soc_pcmcia_socket *skt =

		container_of(dev, struct soc_pcmcia_socket, socket.dev);
@@ -501,7 +501,7 @@ static ssize_t show_status(struct device *dev, char *buf) 


	return p-buf;

}

static CLASS_DEVICE_ATTR(status, S_IRUGO, show_status, NULL);

static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);





static struct pccard_operations soc_common_pcmcia_operations = {
@@ -660,7 +660,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops 


		skt->socket.ops = &soc_common_pcmcia_operations;

		skt->socket.owner = ops->owner;

		skt->socket.dev.dev = dev;

		skt->socket.dev.parent = dev;



		init_timer(&skt->poll_timer);

		skt->poll_timer.function = soc_common_pcmcia_poll_event;
@@ -747,7 +747,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops 


		add_timer(&skt->poll_timer);



		device_create_file(&skt->socket.dev, &device_attr_status);

		device_create_file(&skt->socket.dev, &dev_attr_status);

	}



	dev_set_drvdata(dev, sinfo);

drivers/serial/serial_cs.c

+5 −0
Original line number Diff line number Diff line
@@ -246,6 +246,10 @@ static const struct serial_quirk quirks[] = { 
		.manfid	= MANFID_QUATECH,

		.prodid	= PRODID_QUATECH_DUAL_RS232_D1,

		.multi	= 2,

	}, {

		.manfid	= MANFID_QUATECH,

		.prodid	= PRODID_QUATECH_DUAL_RS232_G,

		.multi	= 2,

	}, {

		.manfid	= MANFID_QUATECH,

		.prodid	= PRODID_QUATECH_QUAD_RS232,
@@ -891,6 +895,7 @@ static struct pcmcia_device_id serial_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("OEM      ", "C288MX     ", 0xb572d360, 0xd2385b7a),

	PCMCIA_DEVICE_PROD_ID12("PCMCIA   ", "C336MX     ", 0x99bcafe9, 0xaa25bcab),

	PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),

	PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),

	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "PCMLM28.cis"),

	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "PCMLM28.cis"),

	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"),