Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 80a55e923c76e022de298929e0c09bcca5c247d9

Authored by Andrew Morton
Committed by Dominik Brodowski
1 parent a0aab14322
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] pcmcia: remove unneeded forward declarations 

Also remove a couple of unneeded typecasts.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

... ... @@ -298,9 +298,6 @@
298 298 *
299 299 * Registers a PCMCIA driver with the PCMCIA bus core.
300 300 */
301   -static int pcmcia_device_probe(struct device *dev);
302   -static int pcmcia_device_remove(struct device * dev);
303   -
304 301 int pcmcia_register_driver(struct pcmcia_driver *driver)
305 302 {
306 303 if (!driver)
... ... @@ -400,7 +397,7 @@
400 397 * call which will then check whether there are two
401 398 * pseudo devices, and if not, add the second one.
402 399 */
403   - did = (struct pcmcia_device_id *) p_dev->dev.driver_data;
  400 + did = p_dev->dev.driver_data;
404 401 if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
405 402 (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
406 403 pcmcia_add_pseudo_device(p_dev->socket);
... ... @@ -448,7 +445,6 @@
448 445 return;
449 446 }
450 447  
451   -
452 448 static int pcmcia_device_remove(struct device * dev)
453 449 {
454 450 struct pcmcia_device *p_dev;
... ... @@ -463,7 +459,7 @@
463 459 * pseudo multi-function card, we need to unbind
464 460 * all devices
465 461 */
466   - did = (struct pcmcia_device_id *) p_dev->dev.driver_data;
  462 + did = p_dev->dev.driver_data;
467 463 if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
468 464 (p_dev->socket->device_count != 0) &&
469 465 (p_dev->device_no == 0))