[PATCH 1/4] [media] rename drivers/media/IR to drives/media/rc

[PATCH 1/4] [media] rename drivers/media/IR to drives/media/rc

[Mauro Carvalho Chehab]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

 rename drivers/media/{IR => rc}/Kconfig (99%)
 rename drivers/media/{IR => rc}/Makefile (100%)
 rename drivers/media/{IR => rc}/ene_ir.c (100%)
 rename drivers/media/{IR => rc}/ene_ir.h (100%)
 rename drivers/media/{IR => rc}/imon.c (100%)
 rename drivers/media/{IR => rc}/ir-core-priv.h (100%)
 rename drivers/media/{IR => rc}/ir-functions.c (100%)
 rename drivers/media/{IR => rc}/ir-jvc-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-keytable.c (100%)
 rename drivers/media/{IR => rc}/ir-lirc-codec.c (100%)
 rename drivers/media/{IR => rc}/ir-nec-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-raw-event.c (100%)
 rename drivers/media/{IR => rc}/ir-rc5-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-rc5-sz-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-rc6-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-sony-decoder.c (100%)
 rename drivers/media/{IR => rc}/ir-sysfs.c (100%)
 rename drivers/media/{IR => rc}/keymaps/Kconfig (100%)
 rename drivers/media/{IR => rc}/keymaps/Makefile (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-anysee.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-apac-viewcomp.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-a16d.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-cardbus.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-dvbt.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m135a.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avermedia.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-avertv-303.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-azurewave-ad-tu700.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-behold-columbus.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-behold.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-budget-ci-old.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-cinergy.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-digitalnow-tinytwin.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-digittrade.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-em-terratec.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv-fm53.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv2.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-eztv.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-flydvb.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-flyvideo.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-gadmei-rm008z.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-gotview7135.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-hauppauge-new.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-imon-mce.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-imon-pad.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-iodata-bctv7e.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-kaiomy.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-lirc.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-lme2510.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-manli.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-ii.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-iii.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-nebula.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-nec-terratec-cinergy-xs.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-norwood.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-npgtech.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-color.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-grey.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pixelview-mk12.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pixelview-new.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pixelview.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-powercolor-real-angel.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-purpletv.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-pv951.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-rc5-hauppauge-new.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-real-audio-220-32-keys.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-streamzap.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-tbs-nec.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-terratec-cinergy-xs.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-terratec-slim.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-total-media-in-hand.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-trekstor.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-tt-1500.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-videomate-s350.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c (100%)
 rename drivers/media/{IR => rc}/keymaps/rc-winfast.c (100%)
 rename drivers/media/{IR => rc}/lirc_dev.c (100%)
 rename drivers/media/{IR => rc}/mceusb.c (100%)
 rename drivers/media/{IR => rc}/nuvoton-cir.c (100%)
 rename drivers/media/{IR => rc}/nuvoton-cir.h (100%)
 rename drivers/media/{IR => rc}/rc-map.c (100%)
 rename drivers/media/{IR => rc}/streamzap.c (100%)

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index a28541b..c21dfc2 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -99,7 +99,7 @@ config VIDEO_MEDIA
 comment "Multimedia drivers"
 
 source "drivers/media/common/Kconfig"
-source "drivers/media/IR/Kconfig"
+source "drivers/media/rc/Kconfig"
 
 #
 # Tuner drivers for DVB and V4L
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 499b081..b603ea6 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y += common/ IR/ video/
+obj-y += common/ rc/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/drivers/media/IR/Kconfig b/drivers/media/rc/Kconfig
similarity index 99%
rename from drivers/media/IR/Kconfig
rename to drivers/media/rc/Kconfig
index 20e02a0..d05003d 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -28,7 +28,7 @@ config LIRC
 	   LIRC daemon handles protocol decoding for IR reception and
 	   encoding for IR transmitting (aka "blasting").
 
-source "drivers/media/IR/keymaps/Kconfig"
+source "drivers/media/rc/keymaps/Kconfig"
 
 config IR_NEC_DECODER
 	tristate "Enable IR raw decoder for the NEC protocol"
diff --git a/drivers/media/IR/Makefile b/drivers/media/rc/Makefile
similarity index 100%
rename from drivers/media/IR/Makefile
rename to drivers/media/rc/Makefile
diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/rc/ene_ir.c
similarity index 100%
rename from drivers/media/IR/ene_ir.c
rename to drivers/media/rc/ene_ir.c
diff --git a/drivers/media/IR/ene_ir.h b/drivers/media/rc/ene_ir.h
similarity index 100%
rename from drivers/media/IR/ene_ir.h
rename to drivers/media/rc/ene_ir.h
diff --git a/drivers/media/IR/imon.c b/drivers/media/rc/imon.c
similarity index 100%
rename from drivers/media/IR/imon.c
rename to drivers/media/rc/imon.c
diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/rc/ir-core-priv.h
similarity index 100%
rename from drivers/media/IR/ir-core-priv.h
rename to drivers/media/rc/ir-core-priv.h
diff --git a/drivers/media/IR/ir-functions.c b/drivers/media/rc/ir-functions.c
similarity index 100%
rename from drivers/media/IR/ir-functions.c
rename to drivers/media/rc/ir-functions.c
diff --git a/drivers/media/IR/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-jvc-decoder.c
rename to drivers/media/rc/ir-jvc-decoder.c
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/rc/ir-keytable.c
similarity index 100%
rename from drivers/media/IR/ir-keytable.c
rename to drivers/media/rc/ir-keytable.c
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
similarity index 100%
rename from drivers/media/IR/ir-lirc-codec.c
rename to drivers/media/rc/ir-lirc-codec.c
diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-nec-decoder.c
rename to drivers/media/rc/ir-nec-decoder.c
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/rc/ir-raw-event.c
similarity index 100%
rename from drivers/media/IR/ir-raw-event.c
rename to drivers/media/rc/ir-raw-event.c
diff --git a/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-rc5-decoder.c
rename to drivers/media/rc/ir-rc5-decoder.c
diff --git a/drivers/media/IR/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-rc5-sz-decoder.c
rename to drivers/media/rc/ir-rc5-sz-decoder.c
diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-rc6-decoder.c
rename to drivers/media/rc/ir-rc6-decoder.c
diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
similarity index 100%
rename from drivers/media/IR/ir-sony-decoder.c
rename to drivers/media/rc/ir-sony-decoder.c
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/rc/ir-sysfs.c
similarity index 100%
rename from drivers/media/IR/ir-sysfs.c
rename to drivers/media/rc/ir-sysfs.c
diff --git a/drivers/media/IR/keymaps/Kconfig b/drivers/media/rc/keymaps/Kconfig
similarity index 100%
rename from drivers/media/IR/keymaps/Kconfig
rename to drivers/media/rc/keymaps/Kconfig
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
similarity index 100%
rename from drivers/media/IR/keymaps/Makefile
rename to drivers/media/rc/keymaps/Makefile
diff --git a/drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c b/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c
rename to drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
diff --git a/drivers/media/IR/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-alink-dtu-m.c
rename to drivers/media/rc/keymaps/rc-alink-dtu-m.c
diff --git a/drivers/media/IR/keymaps/rc-anysee.c b/drivers/media/rc/keymaps/rc-anysee.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-anysee.c
rename to drivers/media/rc/keymaps/rc-anysee.c
diff --git a/drivers/media/IR/keymaps/rc-apac-viewcomp.c b/drivers/media/rc/keymaps/rc-apac-viewcomp.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-apac-viewcomp.c
rename to drivers/media/rc/keymaps/rc-apac-viewcomp.c
diff --git a/drivers/media/IR/keymaps/rc-asus-pc39.c b/drivers/media/rc/keymaps/rc-asus-pc39.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-asus-pc39.c
rename to drivers/media/rc/keymaps/rc-asus-pc39.c
diff --git a/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c
rename to drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-a16d.c b/drivers/media/rc/keymaps/rc-avermedia-a16d.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-a16d.c
rename to drivers/media/rc/keymaps/rc-avermedia-a16d.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-cardbus.c b/drivers/media/rc/keymaps/rc-avermedia-cardbus.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-cardbus.c
rename to drivers/media/rc/keymaps/rc-avermedia-cardbus.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-dvbt.c b/drivers/media/rc/keymaps/rc-avermedia-dvbt.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-dvbt.c
rename to drivers/media/rc/keymaps/rc-avermedia-dvbt.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a.c b/drivers/media/rc/keymaps/rc-avermedia-m135a.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-m135a.c
rename to drivers/media/rc/keymaps/rc-avermedia-m135a.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
rename to drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia-rm-ks.c b/drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia-rm-ks.c
rename to drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
diff --git a/drivers/media/IR/keymaps/rc-avermedia.c b/drivers/media/rc/keymaps/rc-avermedia.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avermedia.c
rename to drivers/media/rc/keymaps/rc-avermedia.c
diff --git a/drivers/media/IR/keymaps/rc-avertv-303.c b/drivers/media/rc/keymaps/rc-avertv-303.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-avertv-303.c
rename to drivers/media/rc/keymaps/rc-avertv-303.c
diff --git a/drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c
rename to drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
diff --git a/drivers/media/IR/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-behold-columbus.c
rename to drivers/media/rc/keymaps/rc-behold-columbus.c
diff --git a/drivers/media/IR/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-behold.c
rename to drivers/media/rc/keymaps/rc-behold.c
diff --git a/drivers/media/IR/keymaps/rc-budget-ci-old.c b/drivers/media/rc/keymaps/rc-budget-ci-old.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-budget-ci-old.c
rename to drivers/media/rc/keymaps/rc-budget-ci-old.c
diff --git a/drivers/media/IR/keymaps/rc-cinergy-1400.c b/drivers/media/rc/keymaps/rc-cinergy-1400.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-cinergy-1400.c
rename to drivers/media/rc/keymaps/rc-cinergy-1400.c
diff --git a/drivers/media/IR/keymaps/rc-cinergy.c b/drivers/media/rc/keymaps/rc-cinergy.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-cinergy.c
rename to drivers/media/rc/keymaps/rc-cinergy.c
diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-dib0700-nec.c
rename to drivers/media/rc/keymaps/rc-dib0700-nec.c
diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-dib0700-rc5.c
rename to drivers/media/rc/keymaps/rc-dib0700-rc5.c
diff --git a/drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c b/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c
rename to drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
diff --git a/drivers/media/IR/keymaps/rc-digittrade.c b/drivers/media/rc/keymaps/rc-digittrade.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-digittrade.c
rename to drivers/media/rc/keymaps/rc-digittrade.c
diff --git a/drivers/media/IR/keymaps/rc-dm1105-nec.c b/drivers/media/rc/keymaps/rc-dm1105-nec.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-dm1105-nec.c
rename to drivers/media/rc/keymaps/rc-dm1105-nec.c
diff --git a/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c
rename to drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
diff --git a/drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c b/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c
rename to drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
diff --git a/drivers/media/IR/keymaps/rc-em-terratec.c b/drivers/media/rc/keymaps/rc-em-terratec.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-em-terratec.c
rename to drivers/media/rc/keymaps/rc-em-terratec.c
diff --git a/drivers/media/IR/keymaps/rc-encore-enltv-fm53.c b/drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-encore-enltv-fm53.c
rename to drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
diff --git a/drivers/media/IR/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-encore-enltv.c
rename to drivers/media/rc/keymaps/rc-encore-enltv.c
diff --git a/drivers/media/IR/keymaps/rc-encore-enltv2.c b/drivers/media/rc/keymaps/rc-encore-enltv2.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-encore-enltv2.c
rename to drivers/media/rc/keymaps/rc-encore-enltv2.c
diff --git a/drivers/media/IR/keymaps/rc-evga-indtube.c b/drivers/media/rc/keymaps/rc-evga-indtube.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-evga-indtube.c
rename to drivers/media/rc/keymaps/rc-evga-indtube.c
diff --git a/drivers/media/IR/keymaps/rc-eztv.c b/drivers/media/rc/keymaps/rc-eztv.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-eztv.c
rename to drivers/media/rc/keymaps/rc-eztv.c
diff --git a/drivers/media/IR/keymaps/rc-flydvb.c b/drivers/media/rc/keymaps/rc-flydvb.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-flydvb.c
rename to drivers/media/rc/keymaps/rc-flydvb.c
diff --git a/drivers/media/IR/keymaps/rc-flyvideo.c b/drivers/media/rc/keymaps/rc-flyvideo.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-flyvideo.c
rename to drivers/media/rc/keymaps/rc-flyvideo.c
diff --git a/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-fusionhdtv-mce.c
rename to drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
diff --git a/drivers/media/IR/keymaps/rc-gadmei-rm008z.c b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-gadmei-rm008z.c
rename to drivers/media/rc/keymaps/rc-gadmei-rm008z.c
diff --git a/drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c b/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c
rename to drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
diff --git a/drivers/media/IR/keymaps/rc-gotview7135.c b/drivers/media/rc/keymaps/rc-gotview7135.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-gotview7135.c
rename to drivers/media/rc/keymaps/rc-gotview7135.c
diff --git a/drivers/media/IR/keymaps/rc-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge-new.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-hauppauge-new.c
rename to drivers/media/rc/keymaps/rc-hauppauge-new.c
diff --git a/drivers/media/IR/keymaps/rc-imon-mce.c b/drivers/media/rc/keymaps/rc-imon-mce.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-imon-mce.c
rename to drivers/media/rc/keymaps/rc-imon-mce.c
diff --git a/drivers/media/IR/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-imon-pad.c
rename to drivers/media/rc/keymaps/rc-imon-pad.c
diff --git a/drivers/media/IR/keymaps/rc-iodata-bctv7e.c b/drivers/media/rc/keymaps/rc-iodata-bctv7e.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-iodata-bctv7e.c
rename to drivers/media/rc/keymaps/rc-iodata-bctv7e.c
diff --git a/drivers/media/IR/keymaps/rc-kaiomy.c b/drivers/media/rc/keymaps/rc-kaiomy.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-kaiomy.c
rename to drivers/media/rc/keymaps/rc-kaiomy.c
diff --git a/drivers/media/IR/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-kworld-315u.c
rename to drivers/media/rc/keymaps/rc-kworld-315u.c
diff --git a/drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c b/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c
rename to drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
diff --git a/drivers/media/IR/keymaps/rc-leadtek-y04g0051.c b/drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-leadtek-y04g0051.c
rename to drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
diff --git a/drivers/media/IR/keymaps/rc-lirc.c b/drivers/media/rc/keymaps/rc-lirc.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-lirc.c
rename to drivers/media/rc/keymaps/rc-lirc.c
diff --git a/drivers/media/IR/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-lme2510.c
rename to drivers/media/rc/keymaps/rc-lme2510.c
diff --git a/drivers/media/IR/keymaps/rc-manli.c b/drivers/media/rc/keymaps/rc-manli.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-manli.c
rename to drivers/media/rc/keymaps/rc-manli.c
diff --git a/drivers/media/IR/keymaps/rc-msi-digivox-ii.c b/drivers/media/rc/keymaps/rc-msi-digivox-ii.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-msi-digivox-ii.c
rename to drivers/media/rc/keymaps/rc-msi-digivox-ii.c
diff --git a/drivers/media/IR/keymaps/rc-msi-digivox-iii.c b/drivers/media/rc/keymaps/rc-msi-digivox-iii.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-msi-digivox-iii.c
rename to drivers/media/rc/keymaps/rc-msi-digivox-iii.c
diff --git a/drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c
rename to drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
diff --git a/drivers/media/IR/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-msi-tvanywhere.c
rename to drivers/media/rc/keymaps/rc-msi-tvanywhere.c
diff --git a/drivers/media/IR/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-nebula.c
rename to drivers/media/rc/keymaps/rc-nebula.c
diff --git a/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c
rename to drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
diff --git a/drivers/media/IR/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-norwood.c
rename to drivers/media/rc/keymaps/rc-norwood.c
diff --git a/drivers/media/IR/keymaps/rc-npgtech.c b/drivers/media/rc/keymaps/rc-npgtech.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-npgtech.c
rename to drivers/media/rc/keymaps/rc-npgtech.c
diff --git a/drivers/media/IR/keymaps/rc-pctv-sedna.c b/drivers/media/rc/keymaps/rc-pctv-sedna.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pctv-sedna.c
rename to drivers/media/rc/keymaps/rc-pctv-sedna.c
diff --git a/drivers/media/IR/keymaps/rc-pinnacle-color.c b/drivers/media/rc/keymaps/rc-pinnacle-color.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pinnacle-color.c
rename to drivers/media/rc/keymaps/rc-pinnacle-color.c
diff --git a/drivers/media/IR/keymaps/rc-pinnacle-grey.c b/drivers/media/rc/keymaps/rc-pinnacle-grey.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pinnacle-grey.c
rename to drivers/media/rc/keymaps/rc-pinnacle-grey.c
diff --git a/drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c b/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c
rename to drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
diff --git a/drivers/media/IR/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pixelview-mk12.c
rename to drivers/media/rc/keymaps/rc-pixelview-mk12.c
diff --git a/drivers/media/IR/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pixelview-new.c
rename to drivers/media/rc/keymaps/rc-pixelview-new.c
diff --git a/drivers/media/IR/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pixelview.c
rename to drivers/media/rc/keymaps/rc-pixelview.c
diff --git a/drivers/media/IR/keymaps/rc-powercolor-real-angel.c b/drivers/media/rc/keymaps/rc-powercolor-real-angel.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-powercolor-real-angel.c
rename to drivers/media/rc/keymaps/rc-powercolor-real-angel.c
diff --git a/drivers/media/IR/keymaps/rc-proteus-2309.c b/drivers/media/rc/keymaps/rc-proteus-2309.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-proteus-2309.c
rename to drivers/media/rc/keymaps/rc-proteus-2309.c
diff --git a/drivers/media/IR/keymaps/rc-purpletv.c b/drivers/media/rc/keymaps/rc-purpletv.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-purpletv.c
rename to drivers/media/rc/keymaps/rc-purpletv.c
diff --git a/drivers/media/IR/keymaps/rc-pv951.c b/drivers/media/rc/keymaps/rc-pv951.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-pv951.c
rename to drivers/media/rc/keymaps/rc-pv951.c
diff --git a/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c
rename to drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
diff --git a/drivers/media/IR/keymaps/rc-rc5-tv.c b/drivers/media/rc/keymaps/rc-rc5-tv.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-rc5-tv.c
rename to drivers/media/rc/keymaps/rc-rc5-tv.c
diff --git a/drivers/media/IR/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-rc6-mce.c
rename to drivers/media/rc/keymaps/rc-rc6-mce.c
diff --git a/drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c b/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c
rename to drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
diff --git a/drivers/media/IR/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-streamzap.c
rename to drivers/media/rc/keymaps/rc-streamzap.c
diff --git a/drivers/media/IR/keymaps/rc-tbs-nec.c b/drivers/media/rc/keymaps/rc-tbs-nec.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-tbs-nec.c
rename to drivers/media/rc/keymaps/rc-tbs-nec.c
diff --git a/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c
rename to drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
diff --git a/drivers/media/IR/keymaps/rc-terratec-slim.c b/drivers/media/rc/keymaps/rc-terratec-slim.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-terratec-slim.c
rename to drivers/media/rc/keymaps/rc-terratec-slim.c
diff --git a/drivers/media/IR/keymaps/rc-tevii-nec.c b/drivers/media/rc/keymaps/rc-tevii-nec.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-tevii-nec.c
rename to drivers/media/rc/keymaps/rc-tevii-nec.c
diff --git a/drivers/media/IR/keymaps/rc-total-media-in-hand.c b/drivers/media/rc/keymaps/rc-total-media-in-hand.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-total-media-in-hand.c
rename to drivers/media/rc/keymaps/rc-total-media-in-hand.c
diff --git a/drivers/media/IR/keymaps/rc-trekstor.c b/drivers/media/rc/keymaps/rc-trekstor.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-trekstor.c
rename to drivers/media/rc/keymaps/rc-trekstor.c
diff --git a/drivers/media/IR/keymaps/rc-tt-1500.c b/drivers/media/rc/keymaps/rc-tt-1500.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-tt-1500.c
rename to drivers/media/rc/keymaps/rc-tt-1500.c
diff --git a/drivers/media/IR/keymaps/rc-twinhan1027.c b/drivers/media/rc/keymaps/rc-twinhan1027.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-twinhan1027.c
rename to drivers/media/rc/keymaps/rc-twinhan1027.c
diff --git a/drivers/media/IR/keymaps/rc-videomate-s350.c b/drivers/media/rc/keymaps/rc-videomate-s350.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-videomate-s350.c
rename to drivers/media/rc/keymaps/rc-videomate-s350.c
diff --git a/drivers/media/IR/keymaps/rc-videomate-tv-pvr.c b/drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-videomate-tv-pvr.c
rename to drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
diff --git a/drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c b/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c
rename to drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
diff --git a/drivers/media/IR/keymaps/rc-winfast.c b/drivers/media/rc/keymaps/rc-winfast.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-winfast.c
rename to drivers/media/rc/keymaps/rc-winfast.c
diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/rc/lirc_dev.c
similarity index 100%
rename from drivers/media/IR/lirc_dev.c
rename to drivers/media/rc/lirc_dev.c
diff --git a/drivers/media/IR/mceusb.c b/drivers/media/rc/mceusb.c
similarity index 100%
rename from drivers/media/IR/mceusb.c
rename to drivers/media/rc/mceusb.c
diff --git a/drivers/media/IR/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
similarity index 100%
rename from drivers/media/IR/nuvoton-cir.c
rename to drivers/media/rc/nuvoton-cir.c
diff --git a/drivers/media/IR/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
similarity index 100%
rename from drivers/media/IR/nuvoton-cir.h
rename to drivers/media/rc/nuvoton-cir.h
diff --git a/drivers/media/IR/rc-map.c b/drivers/media/rc/rc-map.c
similarity index 100%
rename from drivers/media/IR/rc-map.c
rename to drivers/media/rc/rc-map.c
diff --git a/drivers/media/IR/streamzap.c b/drivers/media/rc/streamzap.c
similarity index 100%
rename from drivers/media/IR/streamzap.c
rename to drivers/media/rc/streamzap.c
-- 
1.7.1

[PATCH 2/4] [media] Rename rc-core files from ir- to rc-

[Mauro Carvalho Chehab]

As protocol decoders are specific to InfraRed, keep their names as-is.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

 rename drivers/media/rc/{ir-core-priv.h => rc-core-priv.h} (100%)
 rename drivers/media/rc/{ir-keytable.c => rc-main.c} (99%)
 rename drivers/media/rc/{ir-raw-event.c => rc-raw.c} (99%)
 rename drivers/media/rc/{ir-sysfs.c => rc-sysfs.c} (99%)

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 38873cf..479a8f4 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,9 +1,9 @@
 ir-common-objs  := ir-functions.o
-ir-core-objs	:= ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o
+rc-core-objs	:= rc-main.o rc-sysfs.o rc-raw.o rc-map.o
 
 obj-y += keymaps/
 
-obj-$(CONFIG_IR_CORE) += ir-core.o
+obj-$(CONFIG_IR_CORE) += rc-core.o
 obj-$(CONFIG_IR_LEGACY) += ir-common.o
 obj-$(CONFIG_LIRC) += lirc_dev.o
 obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
diff --git a/drivers/media/rc/ir-functions.c b/drivers/media/rc/ir-functions.c
index ec021c9..14397d0 100644
--- a/drivers/media/rc/ir-functions.c
+++ b/drivers/media/rc/ir-functions.c
@@ -24,7 +24,7 @@
 #include <linux/string.h>
 #include <linux/jiffies.h>
 #include <media/ir-common.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* -------------------------------------------------------------------------- */
 
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 63dca6e..d83a5f6 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define JVC_NBITS		16		/* dev(8) + func(8) */
 #define JVC_UNIT		525000		/* ns */
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 1d9c6b0..aed69ed 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -17,7 +17,7 @@
 #include <media/lirc.h>
 #include <media/lirc_dev.h>
 #include <media/ir-core.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define LIRCBUF_SIZE 256
 
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 70993f7..cad4e99 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define NEC_NBITS		32
 #define NEC_UNIT		562500  /* ns */
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index 572ed4c..c07f6e0 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -20,7 +20,7 @@
  * the first two bits are start bits, and a third one is a filing bit
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define RC5_NBITS		14
 #define RC5X_NBITS		20
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 7c41350..0c3b6eb 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -20,7 +20,7 @@
  * the first two bits are start bits, and a third one is a filing bit
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define RC5_SZ_NBITS		15
 #define RC5_UNIT		888888 /* ns */
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index d25da91..48e82be 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /*
  * This decoder currently supports:
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index 2d15730..0a5cadb 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define SONY_UNIT		600000 /* ns */
 #define SONY_HEADER_PULSE	(4 * SONY_UNIT)
diff --git a/drivers/media/rc/ir-core-priv.h b/drivers/media/rc/rc-core-priv.h
similarity index 100%
rename from drivers/media/rc/ir-core-priv.h
rename to drivers/media/rc/rc-core-priv.h
diff --git a/drivers/media/rc/ir-keytable.c b/drivers/media/rc/rc-main.c
similarity index 99%
rename from drivers/media/rc/ir-keytable.c
rename to drivers/media/rc/rc-main.c
index d0c3c0e..af7119f 100644
--- a/drivers/media/rc/ir-keytable.c
+++ b/drivers/media/rc/rc-main.c
@@ -15,7 +15,7 @@
 
 #include <linux/input.h>
 #include <linux/slab.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */
 #define IR_TAB_MIN_SIZE	256
diff --git a/drivers/media/rc/ir-raw-event.c b/drivers/media/rc/rc-raw.c
similarity index 99%
rename from drivers/media/rc/ir-raw-event.c
rename to drivers/media/rc/rc-raw.c
index a06a07e..d6c556e 100644
--- a/drivers/media/rc/ir-raw-event.c
+++ b/drivers/media/rc/rc-raw.c
@@ -16,7 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 /* Define the max number of pulse/space transitions to buffer */
 #define MAX_IR_EVENT_SIZE      512
diff --git a/drivers/media/rc/ir-sysfs.c b/drivers/media/rc/rc-sysfs.c
similarity index 99%
rename from drivers/media/rc/ir-sysfs.c
rename to drivers/media/rc/rc-sysfs.c
index 38423a8..a5f81d1 100644
--- a/drivers/media/rc/ir-sysfs.c
+++ b/drivers/media/rc/rc-sysfs.c
@@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/device.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
 
 #define IRRCV_NUM_DEVICES	256
 
-- 
1.7.1

[PATCH 3/4] [media] rc-core: Merge rc-sysfs.c into rc-main.c

[Mauro Carvalho Chehab]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

 delete mode 100644 drivers/media/rc/rc-sysfs.c

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 479a8f4..5a1112c 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,5 +1,5 @@
 ir-common-objs  := ir-functions.o
-rc-core-objs	:= rc-main.o rc-sysfs.o rc-raw.o rc-map.o
+rc-core-objs	:= rc-main.o rc-raw.o rc-map.o
 
 obj-y += keymaps/
 
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index af7119f..3942673 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1,6 +1,6 @@
-/* ir-keytable.c - handle IR scancode->keycode tables
+/* rc-core.c - handle IR scancode->keycode tables
  *
- * Copyright (C) 2009 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,8 +15,14 @@
 
 #include <linux/input.h>
 #include <linux/slab.h>
+#include <linux/device.h>
 #include "rc-core-priv.h"
 
+#define IRRCV_NUM_DEVICES	256
+
+/* bit array to represent IR sysfs device number */
+static unsigned long ir_core_dev_number;
+
 /* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */
 #define IR_TAB_MIN_SIZE	256
 #define IR_TAB_MAX_SIZE	8192
@@ -625,6 +631,345 @@ void ir_input_unregister(struct input_dev *input_dev)
 }
 EXPORT_SYMBOL_GPL(ir_input_unregister);
 
+/* class for /sys/class/rc */
+static char *ir_devnode(struct device *dev, mode_t *mode)
+{
+	return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));
+}
+
+static struct class ir_input_class = {
+	.name		= "rc",
+	.devnode	= ir_devnode,
+};
+
+static struct {
+	u64	type;
+	char	*name;
+} proto_names[] = {
+	{ IR_TYPE_UNKNOWN,	"unknown"	},
+	{ IR_TYPE_RC5,		"rc-5"		},
+	{ IR_TYPE_NEC,		"nec"		},
+	{ IR_TYPE_RC6,		"rc-6"		},
+	{ IR_TYPE_JVC,		"jvc"		},
+	{ IR_TYPE_SONY,		"sony"		},
+	{ IR_TYPE_RC5_SZ,	"rc-5-sz"	},
+	{ IR_TYPE_LIRC,		"lirc"		},
+};
+
+#define PROTO_NONE	"none"
+
+/**
+ * show_protocols() - shows the current IR protocol(s)
+ * @d:		the device descriptor
+ * @mattr:	the device attribute struct (unused)
+ * @buf:	a pointer to the output buffer
+ *
+ * This routine is a callback routine for input read the IR protocol type(s).
+ * it is trigged by reading /sys/class/rc/rc?/protocols.
+ * It returns the protocol names of supported protocols.
+ * Enabled protocols are printed in brackets.
+ */
+static ssize_t show_protocols(struct device *d,
+			      struct device_attribute *mattr, char *buf)
+{
+	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
+	u64 allowed, enabled;
+	char *tmp = buf;
+	int i;
+
+	/* Device is being removed */
+	if (!ir_dev)
+		return -EINVAL;
+
+	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
+		enabled = ir_dev->rc_tab.ir_type;
+		allowed = ir_dev->props->allowed_protos;
+	} else if (ir_dev->raw) {
+		enabled = ir_dev->raw->enabled_protocols;
+		allowed = ir_raw_get_allowed_protocols();
+	} else
+		return sprintf(tmp, "[builtin]\n");
+
+	IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
+		   (long long)allowed,
+		   (long long)enabled);
+
+	for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
+		if (allowed & enabled & proto_names[i].type)
+			tmp += sprintf(tmp, "[%s] ", proto_names[i].name);
+		else if (allowed & proto_names[i].type)
+			tmp += sprintf(tmp, "%s ", proto_names[i].name);
+	}
+
+	if (tmp != buf)
+		tmp--;
+	*tmp = '\n';
+	return tmp + 1 - buf;
+}
+
+/**
+ * store_protocols() - changes the current IR protocol(s)
+ * @d:		the device descriptor
+ * @mattr:	the device attribute struct (unused)
+ * @buf:	a pointer to the input buffer
+ * @len:	length of the input buffer
+ *
+ * This routine is a callback routine for changing the IR protocol type.
+ * It is trigged by writing to /sys/class/rc/rc?/protocols.
+ * Writing "+proto" will add a protocol to the list of enabled protocols.
+ * Writing "-proto" will remove a protocol from the list of enabled protocols.
+ * Writing "proto" will enable only "proto".
+ * Writing "none" will disable all protocols.
+ * Returns -EINVAL if an invalid protocol combination or unknown protocol name
+ * is used, otherwise @len.
+ */
+static ssize_t store_protocols(struct device *d,
+			       struct device_attribute *mattr,
+			       const char *data,
+			       size_t len)
+{
+	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
+	bool enable, disable;
+	const char *tmp;
+	u64 type;
+	u64 mask;
+	int rc, i, count = 0;
+	unsigned long flags;
+
+	/* Device is being removed */
+	if (!ir_dev)
+		return -EINVAL;
+
+	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
+		type = ir_dev->rc_tab.ir_type;
+	else if (ir_dev->raw)
+		type = ir_dev->raw->enabled_protocols;
+	else {
+		IR_dprintk(1, "Protocol switching not supported\n");
+		return -EINVAL;
+	}
+
+	while ((tmp = strsep((char **) &data, " \n")) != NULL) {
+		if (!*tmp)
+			break;
+
+		if (*tmp == '+') {
+			enable = true;
+			disable = false;
+			tmp++;
+		} else if (*tmp == '-') {
+			enable = false;
+			disable = true;
+			tmp++;
+		} else {
+			enable = false;
+			disable = false;
+		}
+
+		if (!enable && !disable && !strncasecmp(tmp, PROTO_NONE, sizeof(PROTO_NONE))) {
+			tmp += sizeof(PROTO_NONE);
+			mask = 0;
+			count++;
+		} else {
+			for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
+				if (!strncasecmp(tmp, proto_names[i].name, strlen(proto_names[i].name))) {
+					tmp += strlen(proto_names[i].name);
+					mask = proto_names[i].type;
+					break;
+				}
+			}
+			if (i == ARRAY_SIZE(proto_names)) {
+				IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
+				return -EINVAL;
+			}
+			count++;
+		}
+
+		if (enable)
+			type |= mask;
+		else if (disable)
+			type &= ~mask;
+		else
+			type = mask;
+	}
+
+	if (!count) {
+		IR_dprintk(1, "Protocol not specified\n");
+		return -EINVAL;
+	}
+
+	if (ir_dev->props && ir_dev->props->change_protocol) {
+		rc = ir_dev->props->change_protocol(ir_dev->props->priv,
+						    type);
+		if (rc < 0) {
+			IR_dprintk(1, "Error setting protocols to 0x%llx\n",
+				   (long long)type);
+			return -EINVAL;
+		}
+	}
+
+	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
+		spin_lock_irqsave(&ir_dev->rc_tab.lock, flags);
+		ir_dev->rc_tab.ir_type = type;
+		spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
+	} else {
+		ir_dev->raw->enabled_protocols = type;
+	}
+
+	IR_dprintk(1, "Current protocol(s): 0x%llx\n",
+		   (long long)type);
+
+	return len;
+}
+
+#define ADD_HOTPLUG_VAR(fmt, val...)					\
+	do {								\
+		int err = add_uevent_var(env, fmt, val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+static int rc_dev_uevent(struct device *device, struct kobj_uevent_env *env)
+{
+	struct ir_input_dev *ir_dev = dev_get_drvdata(device);
+
+	if (ir_dev->rc_tab.name)
+		ADD_HOTPLUG_VAR("NAME=%s", ir_dev->rc_tab.name);
+	if (ir_dev->driver_name)
+		ADD_HOTPLUG_VAR("DRV_NAME=%s", ir_dev->driver_name);
+
+	return 0;
+}
+
+/*
+ * Static device attribute struct with the sysfs attributes for IR's
+ */
+static DEVICE_ATTR(protocols, S_IRUGO | S_IWUSR,
+		   show_protocols, store_protocols);
+
+static struct attribute *rc_dev_attrs[] = {
+	&dev_attr_protocols.attr,
+	NULL,
+};
+
+static struct attribute_group rc_dev_attr_grp = {
+	.attrs	= rc_dev_attrs,
+};
+
+static const struct attribute_group *rc_dev_attr_groups[] = {
+	&rc_dev_attr_grp,
+	NULL
+};
+
+static struct device_type rc_dev_type = {
+	.groups		= rc_dev_attr_groups,
+	.uevent		= rc_dev_uevent,
+};
+
+/**
+ * ir_register_class() - creates the sysfs for /sys/class/rc/rc?
+ * @input_dev:	the struct input_dev descriptor of the device
+ *
+ * This routine is used to register the syfs code for IR class
+ */
+int ir_register_class(struct input_dev *input_dev)
+{
+	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+	int devno = find_first_zero_bit(&ir_core_dev_number,
+					IRRCV_NUM_DEVICES);
+
+	if (unlikely(devno < 0))
+		return devno;
+
+	ir_dev->dev.type = &rc_dev_type;
+	ir_dev->devno = devno;
+
+	ir_dev->dev.class = &ir_input_class;
+	ir_dev->dev.parent = input_dev->dev.parent;
+	input_dev->dev.parent = &ir_dev->dev;
+	dev_set_name(&ir_dev->dev, "rc%d", devno);
+	dev_set_drvdata(&ir_dev->dev, ir_dev);
+	return  device_register(&ir_dev->dev);
+};
+
+/**
+ * ir_register_input - registers ir input device with input subsystem
+ * @input_dev:	the struct input_dev descriptor of the device
+ */
+
+int ir_register_input(struct input_dev *input_dev)
+{
+	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+	int rc;
+	const char *path;
+
+
+	rc = input_register_device(input_dev);
+	if (rc < 0) {
+		device_del(&ir_dev->dev);
+		return rc;
+	}
+
+	__module_get(THIS_MODULE);
+
+	path = kobject_get_path(&ir_dev->dev.kobj, GFP_KERNEL);
+	printk(KERN_INFO "%s: %s as %s\n",
+		dev_name(&ir_dev->dev),
+		input_dev->name ? input_dev->name : "Unspecified device",
+		path ? path : "N/A");
+	kfree(path);
+
+	set_bit(ir_dev->devno, &ir_core_dev_number);
+	return 0;
+}
+
+/**
+ * ir_unregister_class() - removes the sysfs for sysfs for
+ *			   /sys/class/rc/rc?
+ * @input_dev:	the struct input_dev descriptor of the device
+ *
+ * This routine is used to unregister the syfs code for IR class
+ */
+void ir_unregister_class(struct input_dev *input_dev)
+{
+	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+
+	input_set_drvdata(input_dev, NULL);
+	clear_bit(ir_dev->devno, &ir_core_dev_number);
+	input_unregister_device(input_dev);
+	device_del(&ir_dev->dev);
+
+	module_put(THIS_MODULE);
+}
+
+/*
+ * Init/exit code for the module. Basically, creates/removes /sys/class/rc
+ */
+
+static int __init ir_core_init(void)
+{
+	int rc = class_register(&ir_input_class);
+	if (rc) {
+		printk(KERN_ERR "ir_core: unable to register rc class\n");
+		return rc;
+	}
+
+	/* Initialize/load the decoders/keymap code that will be used */
+	ir_raw_init();
+	ir_rcmap_init();
+
+	return 0;
+}
+
+static void __exit ir_core_exit(void)
+{
+	class_unregister(&ir_input_class);
+	ir_rcmap_cleanup();
+}
+
+module_init(ir_core_init);
+module_exit(ir_core_exit);
+
 int ir_core_debug;    /* ir_debug level (0,1,2) */
 EXPORT_SYMBOL_GPL(ir_core_debug);
 module_param_named(debug, ir_core_debug, int, 0644);
diff --git a/drivers/media/rc/rc-sysfs.c b/drivers/media/rc/rc-sysfs.c
deleted file mode 100644
index a5f81d1..0000000
--- a/drivers/media/rc/rc-sysfs.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* ir-sysfs.c - sysfs interface for RC devices (/sys/class/rc)
- *
- * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#include <linux/slab.h>
-#include <linux/input.h>
-#include <linux/device.h>
-#include "rc-core-priv.h"
-
-#define IRRCV_NUM_DEVICES	256
-
-/* bit array to represent IR sysfs device number */
-static unsigned long ir_core_dev_number;
-
-/* class for /sys/class/rc */
-static char *ir_devnode(struct device *dev, mode_t *mode)
-{
-	return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));
-}
-
-static struct class ir_input_class = {
-	.name		= "rc",
-	.devnode	= ir_devnode,
-};
-
-static struct {
-	u64	type;
-	char	*name;
-} proto_names[] = {
-	{ IR_TYPE_UNKNOWN,	"unknown"	},
-	{ IR_TYPE_RC5,		"rc-5"		},
-	{ IR_TYPE_NEC,		"nec"		},
-	{ IR_TYPE_RC6,		"rc-6"		},
-	{ IR_TYPE_JVC,		"jvc"		},
-	{ IR_TYPE_SONY,		"sony"		},
-	{ IR_TYPE_RC5_SZ,	"rc-5-sz"	},
-	{ IR_TYPE_LIRC,		"lirc"		},
-};
-
-#define PROTO_NONE	"none"
-
-/**
- * show_protocols() - shows the current IR protocol(s)
- * @d:		the device descriptor
- * @mattr:	the device attribute struct (unused)
- * @buf:	a pointer to the output buffer
- *
- * This routine is a callback routine for input read the IR protocol type(s).
- * it is trigged by reading /sys/class/rc/rc?/protocols.
- * It returns the protocol names of supported protocols.
- * Enabled protocols are printed in brackets.
- */
-static ssize_t show_protocols(struct device *d,
-			      struct device_attribute *mattr, char *buf)
-{
-	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-	u64 allowed, enabled;
-	char *tmp = buf;
-	int i;
-
-	/* Device is being removed */
-	if (!ir_dev)
-		return -EINVAL;
-
-	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
-		enabled = ir_dev->rc_tab.ir_type;
-		allowed = ir_dev->props->allowed_protos;
-	} else if (ir_dev->raw) {
-		enabled = ir_dev->raw->enabled_protocols;
-		allowed = ir_raw_get_allowed_protocols();
-	} else
-		return sprintf(tmp, "[builtin]\n");
-
-	IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
-		   (long long)allowed,
-		   (long long)enabled);
-
-	for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
-		if (allowed & enabled & proto_names[i].type)
-			tmp += sprintf(tmp, "[%s] ", proto_names[i].name);
-		else if (allowed & proto_names[i].type)
-			tmp += sprintf(tmp, "%s ", proto_names[i].name);
-	}
-
-	if (tmp != buf)
-		tmp--;
-	*tmp = '\n';
-	return tmp + 1 - buf;
-}
-
-/**
- * store_protocols() - changes the current IR protocol(s)
- * @d:		the device descriptor
- * @mattr:	the device attribute struct (unused)
- * @buf:	a pointer to the input buffer
- * @len:	length of the input buffer
- *
- * This routine is a callback routine for changing the IR protocol type.
- * It is trigged by writing to /sys/class/rc/rc?/protocols.
- * Writing "+proto" will add a protocol to the list of enabled protocols.
- * Writing "-proto" will remove a protocol from the list of enabled protocols.
- * Writing "proto" will enable only "proto".
- * Writing "none" will disable all protocols.
- * Returns -EINVAL if an invalid protocol combination or unknown protocol name
- * is used, otherwise @len.
- */
-static ssize_t store_protocols(struct device *d,
-			       struct device_attribute *mattr,
-			       const char *data,
-			       size_t len)
-{
-	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-	bool enable, disable;
-	const char *tmp;
-	u64 type;
-	u64 mask;
-	int rc, i, count = 0;
-	unsigned long flags;
-
-	/* Device is being removed */
-	if (!ir_dev)
-		return -EINVAL;
-
-	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-		type = ir_dev->rc_tab.ir_type;
-	else if (ir_dev->raw)
-		type = ir_dev->raw->enabled_protocols;
-	else {
-		IR_dprintk(1, "Protocol switching not supported\n");
-		return -EINVAL;
-	}
-
-	while ((tmp = strsep((char **) &data, " \n")) != NULL) {
-		if (!*tmp)
-			break;
-
-		if (*tmp == '+') {
-			enable = true;
-			disable = false;
-			tmp++;
-		} else if (*tmp == '-') {
-			enable = false;
-			disable = true;
-			tmp++;
-		} else {
-			enable = false;
-			disable = false;
-		}
-
-		if (!enable && !disable && !strncasecmp(tmp, PROTO_NONE, sizeof(PROTO_NONE))) {
-			tmp += sizeof(PROTO_NONE);
-			mask = 0;
-			count++;
-		} else {
-			for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
-				if (!strncasecmp(tmp, proto_names[i].name, strlen(proto_names[i].name))) {
-					tmp += strlen(proto_names[i].name);
-					mask = proto_names[i].type;
-					break;
-				}
-			}
-			if (i == ARRAY_SIZE(proto_names)) {
-				IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
-				return -EINVAL;
-			}
-			count++;
-		}
-
-		if (enable)
-			type |= mask;
-		else if (disable)
-			type &= ~mask;
-		else
-			type = mask;
-	}
-
-	if (!count) {
-		IR_dprintk(1, "Protocol not specified\n");
-		return -EINVAL;
-	}
-
-	if (ir_dev->props && ir_dev->props->change_protocol) {
-		rc = ir_dev->props->change_protocol(ir_dev->props->priv,
-						    type);
-		if (rc < 0) {
-			IR_dprintk(1, "Error setting protocols to 0x%llx\n",
-				   (long long)type);
-			return -EINVAL;
-		}
-	}
-
-	if (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
-		spin_lock_irqsave(&ir_dev->rc_tab.lock, flags);
-		ir_dev->rc_tab.ir_type = type;
-		spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
-	} else {
-		ir_dev->raw->enabled_protocols = type;
-	}
-
-	IR_dprintk(1, "Current protocol(s): 0x%llx\n",
-		   (long long)type);
-
-	return len;
-}
-
-#define ADD_HOTPLUG_VAR(fmt, val...)					\
-	do {								\
-		int err = add_uevent_var(env, fmt, val);		\
-		if (err)						\
-			return err;					\
-	} while (0)
-
-static int rc_dev_uevent(struct device *device, struct kobj_uevent_env *env)
-{
-	struct ir_input_dev *ir_dev = dev_get_drvdata(device);
-
-	if (ir_dev->rc_tab.name)
-		ADD_HOTPLUG_VAR("NAME=%s", ir_dev->rc_tab.name);
-	if (ir_dev->driver_name)
-		ADD_HOTPLUG_VAR("DRV_NAME=%s", ir_dev->driver_name);
-
-	return 0;
-}
-
-/*
- * Static device attribute struct with the sysfs attributes for IR's
- */
-static DEVICE_ATTR(protocols, S_IRUGO | S_IWUSR,
-		   show_protocols, store_protocols);
-
-static struct attribute *rc_dev_attrs[] = {
-	&dev_attr_protocols.attr,
-	NULL,
-};
-
-static struct attribute_group rc_dev_attr_grp = {
-	.attrs	= rc_dev_attrs,
-};
-
-static const struct attribute_group *rc_dev_attr_groups[] = {
-	&rc_dev_attr_grp,
-	NULL
-};
-
-static struct device_type rc_dev_type = {
-	.groups		= rc_dev_attr_groups,
-	.uevent		= rc_dev_uevent,
-};
-
-/**
- * ir_register_class() - creates the sysfs for /sys/class/rc/rc?
- * @input_dev:	the struct input_dev descriptor of the device
- *
- * This routine is used to register the syfs code for IR class
- */
-int ir_register_class(struct input_dev *input_dev)
-{
-	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-	int devno = find_first_zero_bit(&ir_core_dev_number,
-					IRRCV_NUM_DEVICES);
-
-	if (unlikely(devno < 0))
-		return devno;
-
-	ir_dev->dev.type = &rc_dev_type;
-	ir_dev->devno = devno;
-
-	ir_dev->dev.class = &ir_input_class;
-	ir_dev->dev.parent = input_dev->dev.parent;
-	input_dev->dev.parent = &ir_dev->dev;
-	dev_set_name(&ir_dev->dev, "rc%d", devno);
-	dev_set_drvdata(&ir_dev->dev, ir_dev);
-	return  device_register(&ir_dev->dev);
-};
-
-/**
- * ir_register_input - registers ir input device with input subsystem
- * @input_dev:	the struct input_dev descriptor of the device
- */
-
-int ir_register_input(struct input_dev *input_dev)
-{
-	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-	int rc;
-	const char *path;
-
-
-	rc = input_register_device(input_dev);
-	if (rc < 0) {
-		device_del(&ir_dev->dev);
-		return rc;
-	}
-
-	__module_get(THIS_MODULE);
-
-	path = kobject_get_path(&ir_dev->dev.kobj, GFP_KERNEL);
-	printk(KERN_INFO "%s: %s as %s\n",
-		dev_name(&ir_dev->dev),
-		input_dev->name ? input_dev->name : "Unspecified device",
-		path ? path : "N/A");
-	kfree(path);
-
-	set_bit(ir_dev->devno, &ir_core_dev_number);
-	return 0;
-}
-
-/**
- * ir_unregister_class() - removes the sysfs for sysfs for
- *			   /sys/class/rc/rc?
- * @input_dev:	the struct input_dev descriptor of the device
- *
- * This routine is used to unregister the syfs code for IR class
- */
-void ir_unregister_class(struct input_dev *input_dev)
-{
-	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-
-	input_set_drvdata(input_dev, NULL);
-	clear_bit(ir_dev->devno, &ir_core_dev_number);
-	input_unregister_device(input_dev);
-	device_del(&ir_dev->dev);
-
-	module_put(THIS_MODULE);
-}
-
-/*
- * Init/exit code for the module. Basically, creates/removes /sys/class/rc
- */
-
-static int __init ir_core_init(void)
-{
-	int rc = class_register(&ir_input_class);
-	if (rc) {
-		printk(KERN_ERR "ir_core: unable to register rc class\n");
-		return rc;
-	}
-
-	/* Initialize/load the decoders/keymap code that will be used */
-	ir_raw_init();
-	ir_rcmap_init();
-
-	return 0;
-}
-
-static void __exit ir_core_exit(void)
-{
-	class_unregister(&ir_input_class);
-	ir_rcmap_cleanup();
-}
-
-module_init(ir_core_init);
-module_exit(ir_core_exit);
-- 
1.7.1

[PATCH 4/4] [media] rc-core: merge rc-map.c into rc-main.c

[Mauro Carvalho Chehab]

With this change, all rc-core functions are into just one file, except
for the rc-raw specific functions.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

 delete mode 100644 drivers/media/rc/rc-map.c

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 5a1112c..1eb24e6 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,5 +1,5 @@
 ir-common-objs  := ir-functions.o
-rc-core-objs	:= rc-main.o rc-raw.o rc-map.o
+rc-core-objs	:= rc-main.o rc-raw.o
 
 obj-y += keymaps/
 
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 3942673..73813b8 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -12,7 +12,9 @@
  *  GNU General Public License for more details.
  */
 
-
+#include <media/ir-core.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/device.h>
@@ -30,6 +32,96 @@ static unsigned long ir_core_dev_number;
 /* FIXME: IR_KEYPRESS_TIMEOUT should be protocol specific */
 #define IR_KEYPRESS_TIMEOUT 250
 
+/* Used to handle IR raw handler extensions */
+static LIST_HEAD(rc_map_list);
+static DEFINE_SPINLOCK(rc_map_lock);
+
+static struct rc_keymap *seek_rc_map(const char *name)
+{
+	struct rc_keymap *map = NULL;
+
+	spin_lock(&rc_map_lock);
+	list_for_each_entry(map, &rc_map_list, list) {
+		if (!strcmp(name, map->map.name)) {
+			spin_unlock(&rc_map_lock);
+			return map;
+		}
+	}
+	spin_unlock(&rc_map_lock);
+
+	return NULL;
+}
+
+struct ir_scancode_table *get_rc_map(const char *name)
+{
+
+	struct rc_keymap *map;
+
+	map = seek_rc_map(name);
+#ifdef MODULE
+	if (!map) {
+		int rc = request_module(name);
+		if (rc < 0) {
+			printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
+			return NULL;
+		}
+		msleep(20);	/* Give some time for IR to register */
+
+		map = seek_rc_map(name);
+	}
+#endif
+	if (!map) {
+		printk(KERN_ERR "IR keymap %s not found\n", name);
+		return NULL;
+	}
+
+	printk(KERN_INFO "Registered IR keymap %s\n", map->map.name);
+
+	return &map->map;
+}
+EXPORT_SYMBOL_GPL(get_rc_map);
+
+int ir_register_map(struct rc_keymap *map)
+{
+	spin_lock(&rc_map_lock);
+	list_add_tail(&map->list, &rc_map_list);
+	spin_unlock(&rc_map_lock);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(ir_register_map);
+
+void ir_unregister_map(struct rc_keymap *map)
+{
+	spin_lock(&rc_map_lock);
+	list_del(&map->list);
+	spin_unlock(&rc_map_lock);
+}
+EXPORT_SYMBOL_GPL(ir_unregister_map);
+
+
+static struct ir_scancode empty[] = {
+	{ 0x2a, KEY_COFFEE },
+};
+
+static struct rc_keymap empty_map = {
+	.map = {
+		.scan    = empty,
+		.size    = ARRAY_SIZE(empty),
+		.ir_type = IR_TYPE_UNKNOWN,	/* Legacy IR type */
+		.name    = RC_MAP_EMPTY,
+	}
+};
+
+int ir_rcmap_init(void)
+{
+	return ir_register_map(&empty_map);
+}
+
+void ir_rcmap_cleanup(void)
+{
+	ir_unregister_map(&empty_map);
+}
+
 /**
  * ir_resize_table() - resizes a scancode table if necessary
  * @rc_tab:	the ir_scancode_table to resize
diff --git a/drivers/media/rc/rc-map.c b/drivers/media/rc/rc-map.c
deleted file mode 100644
index 689143f..0000000
--- a/drivers/media/rc/rc-map.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ir-raw-event.c - handle IR Pulse/Space event
- *
- * Copyright (C) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-#include <media/ir-core.h>
-#include <linux/spinlock.h>
-#include <linux/delay.h>
-
-/* Used to handle IR raw handler extensions */
-static LIST_HEAD(rc_map_list);
-static DEFINE_SPINLOCK(rc_map_lock);
-
-static struct rc_keymap *seek_rc_map(const char *name)
-{
-	struct rc_keymap *map = NULL;
-
-	spin_lock(&rc_map_lock);
-	list_for_each_entry(map, &rc_map_list, list) {
-		if (!strcmp(name, map->map.name)) {
-			spin_unlock(&rc_map_lock);
-			return map;
-		}
-	}
-	spin_unlock(&rc_map_lock);
-
-	return NULL;
-}
-
-struct ir_scancode_table *get_rc_map(const char *name)
-{
-
-	struct rc_keymap *map;
-
-	map = seek_rc_map(name);
-#ifdef MODULE
-	if (!map) {
-		int rc = request_module(name);
-		if (rc < 0) {
-			printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
-			return NULL;
-		}
-		msleep(20);	/* Give some time for IR to register */
-
-		map = seek_rc_map(name);
-	}
-#endif
-	if (!map) {
-		printk(KERN_ERR "IR keymap %s not found\n", name);
-		return NULL;
-	}
-
-	printk(KERN_INFO "Registered IR keymap %s\n", map->map.name);
-
-	return &map->map;
-}
-EXPORT_SYMBOL_GPL(get_rc_map);
-
-int ir_register_map(struct rc_keymap *map)
-{
-	spin_lock(&rc_map_lock);
-	list_add_tail(&map->list, &rc_map_list);
-	spin_unlock(&rc_map_lock);
-	return 0;
-}
-EXPORT_SYMBOL_GPL(ir_register_map);
-
-void ir_unregister_map(struct rc_keymap *map)
-{
-	spin_lock(&rc_map_lock);
-	list_del(&map->list);
-	spin_unlock(&rc_map_lock);
-}
-EXPORT_SYMBOL_GPL(ir_unregister_map);
-
-
-static struct ir_scancode empty[] = {
-	{ 0x2a, KEY_COFFEE },
-};
-
-static struct rc_keymap empty_map = {
-	.map = {
-		.scan    = empty,
-		.size    = ARRAY_SIZE(empty),
-		.ir_type = IR_TYPE_UNKNOWN,	/* Legacy IR type */
-		.name    = RC_MAP_EMPTY,
-	}
-};
-
-int ir_rcmap_init(void)
-{
-	return ir_register_map(&empty_map);
-}
-
-void ir_rcmap_cleanup(void)
-{
-	ir_unregister_map(&empty_map);
-}
-- 
1.7.1