aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/isapnp/core.c')
-rw-r--r--drivers/pnp/isapnp/core.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index b4e2aa995b53..32386ce60478 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -335,7 +335,7 @@ static int __init isapnp_isolate(void)
335 } else if (iteration > 1) { 335 } else if (iteration > 1) {
336 break; 336 break;
337 } 337 }
338 __next: 338__next:
339 if (csn == 255) 339 if (csn == 255)
340 break; 340 break;
341 checksum = 0x6a; 341 checksum = 0x6a;
@@ -733,7 +733,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
733 "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n", 733 "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
734 type, dev->number, card->number); 734 type, dev->number, card->number);
735 } 735 }
736 __skip: 736__skip:
737 if (size > 0) 737 if (size > 0)
738 isapnp_skip_bytes(size); 738 isapnp_skip_bytes(size);
739 } 739 }
@@ -788,7 +788,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
788 "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n", 788 "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
789 type, card->number); 789 type, card->number);
790 } 790 }
791 __skip: 791__skip:
792 if (size > 0) 792 if (size > 0)
793 isapnp_skip_bytes(size); 793 isapnp_skip_bytes(size);
794 } 794 }
@@ -940,9 +940,6 @@ EXPORT_SYMBOL(isapnp_protocol);
940EXPORT_SYMBOL(isapnp_present); 940EXPORT_SYMBOL(isapnp_present);
941EXPORT_SYMBOL(isapnp_cfg_begin); 941EXPORT_SYMBOL(isapnp_cfg_begin);
942EXPORT_SYMBOL(isapnp_cfg_end); 942EXPORT_SYMBOL(isapnp_cfg_end);
943#if 0
944EXPORT_SYMBOL(isapnp_read_byte);
945#endif
946EXPORT_SYMBOL(isapnp_write_byte); 943EXPORT_SYMBOL(isapnp_write_byte);
947 944
948static int isapnp_read_resources(struct pnp_dev *dev, 945static int isapnp_read_resources(struct pnp_dev *dev,
@@ -993,6 +990,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
993 struct pnp_resource_table *res) 990 struct pnp_resource_table *res)
994{ 991{
995 int ret; 992 int ret;
993
996 pnp_init_resource_table(res); 994 pnp_init_resource_table(res);
997 isapnp_cfg_begin(dev->card->number, dev->number); 995 isapnp_cfg_begin(dev->card->number, dev->number);
998 ret = isapnp_read_resources(dev, res); 996 ret = isapnp_read_resources(dev, res);
@@ -1148,13 +1146,12 @@ static int __init isapnp_init(void)
1148 } 1146 }
1149 } 1147 }
1150 } 1148 }
1151 if (cards) { 1149 if (cards)
1152 printk(KERN_INFO 1150 printk(KERN_INFO
1153 "isapnp: %i Plug & Play card%s detected total\n", cards, 1151 "isapnp: %i Plug & Play card%s detected total\n", cards,
1154 cards > 1 ? "s" : ""); 1152 cards > 1 ? "s" : "");
1155 } else { 1153 else
1156 printk(KERN_INFO "isapnp: No Plug & Play card found\n"); 1154 printk(KERN_INFO "isapnp: No Plug & Play card found\n");
1157 }
1158 1155
1159 isapnp_proc_init(); 1156 isapnp_proc_init();
1160 return 0; 1157 return 0;