Merge branch 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Browse source

Pull ARM pcmcia updates from Russell King:
 "A series of changes updating the PXA and SA11x0 PCMCIA code to use
  devm_* APIs, and resolve some resource leaks in doing so.  This
  results in a few small cleanups which are included in this set.

  FYI, the recommit of these today is to add Robert Jarzmik's
  reviewed-by tags, which I'd forgotten to add from mid-July"

* 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  pcmcia: soc_common: remove skt_dev_info's clk pointer
  pcmcia: sa11xx_base.c: remove useless init/exit functions
  pcmcia: sa1111: simplify clk handing in sa1111_pcmcia_add()
  pcmcia: sa1111: update socket driver to use devm_clk_get() API
  pcmcia: pxa2xx: convert memory allocation to devm_* API
  pcmcia: pxa2xx: update socket driver to use devm_clk_get() API
  pcmcia: sa11x0: convert memory allocation to devm_* API
  pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers

...

This commit is contained in:

Linus Torvalds 2015-09-03 16:36:33 -07:00

parent c706c7eb0d fca8b807a6

commit 4c92b5bb14

5 changed files with 14 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

drivers/pcmcia/pxa2xx_base.c

View file

2

drivers/pcmcia/sa1100_generic.c

View file

14

drivers/pcmcia/sa1111_generic.c

View file

17

drivers/pcmcia/sa11xx_base.c

View file

1

drivers/pcmcia/soc_common.h

View file