Commit 07d6f6dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull pcmcia updates from Dominik Brodowski:
 "A few PCMCIA odd fixes: removing a few spaces and useless casts,
  replacing snprintf() with scnprintf(), and replacing zero-length
  arrays with a flexible-array member"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove some unused space characters
  pcmcia: soc_common.h: Replace zero-length array with flexible-array member
  pcmcia: cs_internal.h: Replace zero-length array with flexible-array member
  pcmcia: Use scnprintf() for avoiding potential buffer overflow
  pcmcia: omap: remove useless cast for driver.name
parents 7e634208 a8c122f7

drivers/pcmcia/cs_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct cis_cache_entry { 
	unsigned int		addr;

	unsigned int		len;

	unsigned int		attr;

	unsigned char		cache[0];

	unsigned char		cache[];

};



struct pccard_resource_ops {

drivers/pcmcia/omap_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev) 


static struct platform_driver omap_cf_driver = {

	.driver = {

		.name	= (char *) driver_name,

		.name	= driver_name,

	},

	.remove		= __exit_p(omap_cf_remove),

};

drivers/pcmcia/rsrc_nonstatic.c

+3 −3
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ static ssize_t show_io_db(struct device *dev, 
	for (p = data->io_db.next; p != &data->io_db; p = p->next) {

		if (ret > (PAGE_SIZE - 10))

			continue;

		ret += snprintf(&buf[ret], (PAGE_SIZE - ret - 1),

		ret += scnprintf(&buf[ret], (PAGE_SIZE - ret - 1),

				"0x%08lx - 0x%08lx\n",

				((unsigned long) p->base),

				((unsigned long) p->base + p->num - 1));
@@ -1133,7 +1133,7 @@ static ssize_t show_mem_db(struct device *dev, 
	     p = p->next) {

		if (ret > (PAGE_SIZE - 10))

			continue;

		ret += snprintf(&buf[ret], (PAGE_SIZE - ret - 1),

		ret += scnprintf(&buf[ret], (PAGE_SIZE - ret - 1),

				"0x%08lx - 0x%08lx\n",

				((unsigned long) p->base),

				((unsigned long) p->base + p->num - 1));
@@ -1142,7 +1142,7 @@ static ssize_t show_mem_db(struct device *dev, 
	for (p = data->mem_db.next; p != &data->mem_db; p = p->next) {

		if (ret > (PAGE_SIZE - 10))

			continue;

		ret += snprintf(&buf[ret], (PAGE_SIZE - ret - 1),

		ret += scnprintf(&buf[ret], (PAGE_SIZE - ret - 1),

				"0x%08lx - 0x%08lx\n",

				((unsigned long) p->base),

				((unsigned long) p->base + p->num - 1));

drivers/pcmcia/soc_common.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct soc_pcmcia_socket { 


struct skt_dev_info {

	int nskt;

	struct soc_pcmcia_socket skt[0];

	struct soc_pcmcia_socket skt[];

};



struct pcmcia_state {

drivers/pcmcia/yenta_socket.c

+5 −5
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ static ssize_t show_yenta_registers(struct device *yentadev, struct device_attri 
	for (i = 0; i < 0x24; i += 4) {

		unsigned val;

		if (!(i & 15))

			offset += snprintf(buf + offset, PAGE_SIZE - offset, "\n%02x:", i);

			offset += scnprintf(buf + offset, PAGE_SIZE - offset, "\n%02x:", i);

		val = cb_readl(socket, i);

		offset += snprintf(buf + offset, PAGE_SIZE - offset, " %08x", val);

		offset += scnprintf(buf + offset, PAGE_SIZE - offset, " %08x", val);

	}



	offset += snprintf(buf + offset, PAGE_SIZE - offset, "\n\nExCA registers:");

	offset += scnprintf(buf + offset, PAGE_SIZE - offset, "\n\nExCA registers:");

	for (i = 0; i < 0x45; i++) {

		unsigned char val;

		if (!(i & 7)) {
@@ -193,10 +193,10 @@ static ssize_t show_yenta_registers(struct device *yentadev, struct device_attri 
				memcpy(buf + offset, " -", 2);

				offset += 2;

			} else

				offset += snprintf(buf + offset, PAGE_SIZE - offset, "\n%02x:", i);

				offset += scnprintf(buf + offset, PAGE_SIZE - offset, "\n%02x:", i);

		}

		val = exca_readb(socket, i);

		offset += snprintf(buf + offset, PAGE_SIZE - offset, " %02x", val);

		offset += scnprintf(buf + offset, PAGE_SIZE - offset, " %02x", val);

	}

	buf[offset++] = '\n';

	return offset;

drivers/pcmcia/sa1100_simpad.c

+3 −3

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE