| .. | .. |
|---|
| 51 | 51 | } |
|---|
| 52 | 52 | |
|---|
| 53 | 53 | /** |
|---|
| 54 | | - * pnp_protocol_register - adds a pnp protocol to the pnp layer |
|---|
| 54 | + * pnp_register_protocol - adds a pnp protocol to the pnp layer |
|---|
| 55 | 55 | * @protocol: pointer to the corresponding pnp_protocol structure |
|---|
| 56 | 56 | * |
|---|
| 57 | 57 | * Ex protocols: ISAPNP, PNPBIOS, etc |
|---|
| .. | .. |
|---|
| 91 | 91 | } |
|---|
| 92 | 92 | |
|---|
| 93 | 93 | /** |
|---|
| 94 | | - * pnp_protocol_unregister - removes a pnp protocol from the pnp layer |
|---|
| 94 | + * pnp_unregister_protocol - removes a pnp protocol from the pnp layer |
|---|
| 95 | 95 | * @protocol: pointer to the corresponding pnp_protocol structure |
|---|
| 96 | 96 | */ |
|---|
| 97 | 97 | void pnp_unregister_protocol(struct pnp_protocol *protocol) |
|---|
| .. | .. |
|---|
| 160 | 160 | dev->dev.coherent_dma_mask = dev->dma_mask; |
|---|
| 161 | 161 | dev->dev.release = &pnp_release_device; |
|---|
| 162 | 162 | |
|---|
| 163 | | - dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); |
|---|
| 164 | | - |
|---|
| 165 | 163 | dev_id = pnp_add_id(dev, pnpid); |
|---|
| 166 | 164 | if (!dev_id) { |
|---|
| 167 | 165 | kfree(dev); |
|---|
| 168 | 166 | return NULL; |
|---|
| 169 | 167 | } |
|---|
| 170 | 168 | |
|---|
| 169 | + dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); |
|---|
| 170 | + |
|---|
| 171 | 171 | return dev; |
|---|
| 172 | 172 | } |
|---|
| 173 | 173 | |
|---|