aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Navet <laurent.navet@gmail.com>2013-01-21 16:16:05 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2015-05-30 09:32:41 -0400
commit46f533ccb80d32a08b391fc1c45860e46174b814 (patch)
treeb49222c65b329d6471c90fce1b5115b8bd4dd7b5
parent221f7edb732d5b81d0b41b5c4811121e1c400064 (diff)
drivers: pcmcia: ds.c fix checkpatch errors
fix these checkpatch errors : - ERROR: spaces required around that '<' (ctx:VxW) - ERROR: "foo * bar" should be "foo *bar" - WARNING: please, no space before tabs Signed-off-by: Laurent Navet <laurent.navet@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/pcmcia/ds.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index d3baf0bfca9f..9992bb5e0d4d 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -81,8 +81,8 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
81 81
82 82
83struct pcmcia_dynid { 83struct pcmcia_dynid {
84 struct list_head node; 84 struct list_head node;
85 struct pcmcia_device_id id; 85 struct pcmcia_device_id id;
86}; 86};
87 87
88/** 88/**
@@ -566,7 +566,7 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
566 c->io[i].name = p_dev->devname; 566 c->io[i].name = p_dev->devname;
567 c->io[i].flags = IORESOURCE_IO; 567 c->io[i].flags = IORESOURCE_IO;
568 } 568 }
569 for (i = 0; i< MAX_WIN; i++) { 569 for (i = 0; i < MAX_WIN; i++) {
570 c->mem[i].name = p_dev->devname; 570 c->mem[i].name = p_dev->devname;
571 c->mem[i].flags = IORESOURCE_MEM; 571 c->mem[i].flags = IORESOURCE_MEM;
572 } 572 }
@@ -651,7 +651,7 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
651} 651}
652 652
653 653
654static int pcmcia_requery_callback(struct device *dev, void * _data) 654static int pcmcia_requery_callback(struct device *dev, void *_data)
655{ 655{
656 struct pcmcia_device *p_dev = to_pcmcia_dev(dev); 656 struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
657 if (!p_dev->dev.driver) { 657 if (!p_dev->dev.driver) {
@@ -729,7 +729,7 @@ static void pcmcia_requery(struct pcmcia_socket *s)
729 * the one provided by the card is broken. The firmware files reside in 729 * the one provided by the card is broken. The firmware files reside in
730 * /lib/firmware/ in userspace. 730 * /lib/firmware/ in userspace.
731 */ 731 */
732static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 732static int pcmcia_load_firmware(struct pcmcia_device *dev, char *filename)
733{ 733{
734 struct pcmcia_socket *s = dev->socket; 734 struct pcmcia_socket *s = dev->socket;
735 const struct firmware *fw; 735 const struct firmware *fw;
@@ -781,7 +781,8 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
781 781
782#else /* !CONFIG_PCMCIA_LOAD_CIS */ 782#else /* !CONFIG_PCMCIA_LOAD_CIS */
783 783
784static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 784static inline int pcmcia_load_firmware(struct pcmcia_device *dev,
785 char *filename)
785{ 786{
786 return -ENODEV; 787 return -ENODEV;
787} 788}
@@ -1206,7 +1207,7 @@ static int pcmcia_dev_resume(struct device *dev)
1206} 1207}
1207 1208
1208 1209
1209static int pcmcia_bus_suspend_callback(struct device *dev, void * _data) 1210static int pcmcia_bus_suspend_callback(struct device *dev, void *_data)
1210{ 1211{
1211 struct pcmcia_socket *skt = _data; 1212 struct pcmcia_socket *skt = _data;
1212 struct pcmcia_device *p_dev = to_pcmcia_dev(dev); 1213 struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
@@ -1217,7 +1218,7 @@ static int pcmcia_bus_suspend_callback(struct device *dev, void * _data)
1217 return runtime_suspend(dev); 1218 return runtime_suspend(dev);
1218} 1219}
1219 1220
1220static int pcmcia_bus_resume_callback(struct device *dev, void * _data) 1221static int pcmcia_bus_resume_callback(struct device *dev, void *_data)
1221{ 1222{
1222 struct pcmcia_socket *skt = _data; 1223 struct pcmcia_socket *skt = _data;
1223 struct pcmcia_device *p_dev = to_pcmcia_dev(dev); 1224 struct pcmcia_device *p_dev = to_pcmcia_dev(dev);