The patch titled remove sonypi_camera_command() has been removed from the -mm tree. Its filename was remove-sonypi_camera_command.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: remove sonypi_camera_command() From: Adrian Bunk <bunk@xxxxxxxxx> Remove the no longer used sonypi_camera_command(). Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Mattia Dongili <malattia@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/sonypi.c | 47 --------------------------------------- include/linux/sonypi.h | 2 - 2 files changed, 49 deletions(-) diff -puN drivers/char/sonypi.c~remove-sonypi_camera_command drivers/char/sonypi.c --- a/drivers/char/sonypi.c~remove-sonypi_camera_command +++ a/drivers/char/sonypi.c @@ -885,53 +885,6 @@ found: return IRQ_HANDLED; } -/* External camera command (exported to the motion eye v4l driver) */ -int sonypi_camera_command(int command, u8 value) -{ - if (!camera) - return -EIO; - - mutex_lock(&sonypi_device.lock); - - switch (command) { - case SONYPI_COMMAND_SETCAMERA: - if (value) - sonypi_camera_on(); - else - sonypi_camera_off(); - break; - case SONYPI_COMMAND_SETCAMERABRIGHTNESS: - sonypi_set(SONYPI_CAMERA_BRIGHTNESS, value); - break; - case SONYPI_COMMAND_SETCAMERACONTRAST: - sonypi_set(SONYPI_CAMERA_CONTRAST, value); - break; - case SONYPI_COMMAND_SETCAMERAHUE: - sonypi_set(SONYPI_CAMERA_HUE, value); - break; - case SONYPI_COMMAND_SETCAMERACOLOR: - sonypi_set(SONYPI_CAMERA_COLOR, value); - break; - case SONYPI_COMMAND_SETCAMERASHARPNESS: - sonypi_set(SONYPI_CAMERA_SHARPNESS, value); - break; - case SONYPI_COMMAND_SETCAMERAPICTURE: - sonypi_set(SONYPI_CAMERA_PICTURE, value); - break; - case SONYPI_COMMAND_SETCAMERAAGC: - sonypi_set(SONYPI_CAMERA_AGC, value); - break; - default: - printk(KERN_ERR "sonypi: sonypi_camera_command invalid: %d\n", - command); - break; - } - mutex_unlock(&sonypi_device.lock); - return 0; -} - -EXPORT_SYMBOL(sonypi_camera_command); - static int sonypi_misc_fasync(int fd, struct file *filp, int on) { int retval; diff -puN include/linux/sonypi.h~remove-sonypi_camera_command include/linux/sonypi.h --- a/include/linux/sonypi.h~remove-sonypi_camera_command +++ a/include/linux/sonypi.h @@ -153,8 +153,6 @@ #define SONYPI_COMMAND_GETCAMERAROMVERSION 18 /* obsolete */ #define SONYPI_COMMAND_GETCAMERAREVISION 19 /* obsolete */ -int sonypi_camera_command(int command, u8 value); - #endif /* __KERNEL__ */ #endif /* _SONYPI_H_ */ _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-acpi.patch cpuidle-add-rating-to-the-governors-and-pick-the-one-with-highest-rating-by-default-fix.patch drivers-acpi-sbsc-remove-dead-code.patch git-alsa.patch git-powerpc.patch git-dvb.patch git-hwmon.patch git-kvm.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch git-mtd.patch drivers-scsi-small-cleanups.patch drivers-scsi-wd33c93c-cleanups.patch make-seagate_st0x_detect-static.patch drivers-scsi-pcmcia-nsp_csc-remove-kernel-24-code.patch git-unionfs.patch git-ipwireless_cs.patch fix-x86_64-mm-xen-add-xen-virtual-block-device-driver.patch fix-x86_64-mm-xen-xen-event-channels.patch arch-i386-xen-mmuc-must-include-linux-schedh.patch make-arch-i386-kernel-setupcremapped_pgdat_init-static.patch arch-i386-kernel-i8253c-should-include-asm-timerh.patch make-arch-i386-kernel-io_apicctimer_irq_works-static-again.patch i386-remove-support-for-the-rise-cpu.patch i386-make-arch-i386-mm-pgtablecpgd_cdtor-static.patch xen-fix-x86-config-dependencies.patch xen-suppress-abs-symbol-warnings-for-unused-reloc-pointers.patch xen-cant-support-numa-yet.patch arch-i386-kernel-smpbootcsetup_trampoline-must-be.patch handle-kernelcore=-generic.patch maps2-add-proc-kpagemap-interface.patch lumpy-reclaim-v4.patch mm-slubc-make-code-static.patch swsusp-remove-code-duplication-between-diskc-and-userc.patch proper-prototype-for-proc_nr_files.patch fs-reiserfs-cleanups.patch introduce-i_sync-fix.patch ext2-reservations.patch oss-trident-fix-locking-around-write_voice_regs.patch remove-options-depending-on-oss_obsolete.patch fbdev-move-arch-specific-bits-to-their-respective.patch pm3fb-possible-cleanups.patch vt8623fbc-make-code-static.patch drivers-video-macmodescmac_find_mode-mustnt-be.patch intel-iommu-intel-iommu-driver.patch mm-variable-length-argument-support.patch revoke-core-code.patch mm-implement-swap-prefetching.patch kernel-relayc-make-functions-static.patch drivers-edac-core-make-functions-static.patch lockstat-human-readability-tweaks.patch reiser4-export-remove_from_page_cache.patch reiser4.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html