Skip to content

Commit

Permalink
micam: atomisp-ov5693: remove vendor id stuff for now
Browse files Browse the repository at this point in the history 
Somehow it's not working:

        kern  :info  : [    6.613853] ov5693 i2c-INT33BE:00: camera pdata: port: 0 lanes: 2 order: 00000002
        kern  :info  : [    7.192186] ov5693 i2c-INT33BE:00: register atomisp i2c module type 1
        kern  :warn  : [    7.192197] ------------[ cut here ]------------
        kern  :warn  : [    7.192206] WARNING: CPU: 0 PID: 222 at fs/proc/generic.c:160 __xlate_proc_name+0xbd/0x110()
        kern  :warn  : [    7.192208] name 'camera/frontvid'
        kern  :warn  : [    7.192210] Modules linked in: mousedev input_leds hid_generic iTCO_wdt hid_multitouch pmic_whiskey_cove nls_iso8859_1 nls_cp437 vfat fat intel_rapl intel_soc_dts_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd pcspkr usbhid atomisp_css2401a0_v21(+) videobuf_vmalloc videobuf_core mei_txe mei processor_thermal_device lpc_ich shpchp intel_soc_dts_iosf thermal atomisp_ov5693(+) v4l2_common videodev battery i2c_hid hid media snd_intel_sst_acpi snd_intel_sst_core snd_soc_sst_mfld_platform snd_soc_core snd_compress dw_dmac snd_pcm_dmaengine fjes dw_dmac_core ac97_bus snd_pcm snd_timer snd i2c_designware_platform soundcore i2c_designware_core 8250_dw spi_pxa2xx_platform tpm_crb
        kern  :warn  : [    7.192270]  int3400_thermal int3403_thermal acpi_thermal_rel int340x_thermal_zone ac acpi_pad pinctrl_cherryview evdev tpm_tis tpm mac_hid processor sch_fq_codel sg scsi_mod crypto_user fuse ip_tables x_tables ext4 crc16 mbcache jbd2 mmc_block crc32c_intel xhci_pci xhci_hcd usbcore usb_common sdhci_acpi sdhci led_class mmc_core i915 video button i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm intel_agp intel_gtt
        kern  :warn  : [    7.192311] CPU: 0 PID: 222 Comm: systemd-udevd Not tainted 4.4.275-1-intel-aero44-lts linux-surface#28
        kern  :warn  : [    7.192313] Hardware name: Xiaomi Inc Mipad2/Mipad, BIOS MIPad-P4.X64.0043.R03.1603071414 03/07/2016
        kern  :warn  : [    7.192316]  0000000000000286 044a54b37a3a6ee9 ffff88007865f940 ffffffff815c4d3b
        kern  :warn  : [    7.192321]  ffff88007865f988 ffffffff8172e35d ffff88007865f978 ffffffff8107b1c6
        kern  :warn  : [    7.192324]  0000000000000006 ffff880074a40180 ffffffffa04bd3d6 0000000000000000
        kern  :warn  : [    7.192329] Call Trace:
        kern  :warn  : [    7.192337]  [<ffffffff815c4d3b>] dump_stack+0x6d/0x8b
        kern  :warn  : [    7.192343]  [<ffffffff8107b1c6>] warn_slowpath_common+0x86/0xd0
        kern  :warn  : [    7.192348]  [<ffffffff8107b26c>] warn_slowpath_fmt+0x5c/0x80
        kern  :warn  : [    7.192352]  [<ffffffff812578dd>] __xlate_proc_name+0xbd/0x110
        kern  :warn  : [    7.192356]  [<ffffffff8125797c>] __proc_create+0x4c/0x270
        kern  :warn  : [    7.192359]  [<ffffffff81257f96>] proc_create_data+0x56/0xd0
        kern  :warn  : [    7.192367]  [<ffffffffa04bc32d>] ov5693_probe+0x90d/0xd80 [atomisp_ov5693]
        kern  :warn  : [    7.192372]  [<ffffffffa04bba20>] ? power_up+0x190/0x190 [atomisp_ov5693]
        kern  :warn  : [    7.192377]  [<ffffffff81452854>] i2c_device_probe+0x174/0x1f0
        kern  :warn  : [    7.192382]  [<ffffffff81407376>] driver_probe_device+0x206/0x420
        kern  :warn  : [    7.192386]  [<ffffffff8140760e>] __driver_attach+0x7e/0x80
        kern  :warn  : [    7.192389]  [<ffffffff81407590>] ? driver_probe_device+0x420/0x420
        kern  :warn  : [    7.192392]  [<ffffffff81404bea>] bus_for_each_dev+0x8a/0xd0
        kern  :warn  : [    7.192396]  [<ffffffff81406ade>] driver_attach+0x1e/0x20
        kern  :warn  : [    7.192399]  [<ffffffff8140669c>] bus_add_driver+0x1dc/0x240
        kern  :warn  : [    7.192402]  [<ffffffff81407f22>] driver_register+0x92/0xe0
        kern  :warn  : [    7.192406]  [<ffffffff814548a4>] i2c_register_driver+0x44/0xd0
        kern  :warn  : [    7.192410]  [<ffffffffa040c000>] ? 0xffffffffa040c000
        kern  :warn  : [    7.192415]  [<ffffffffa040c017>] ov5693_driver_init+0x17/0x1000 [atomisp_ov5693]
        kern  :warn  : [    7.192419]  [<ffffffff810020b6>] do_one_initcall+0xb6/0x1a0
        kern  :warn  : [    7.192424]  [<ffffffff810fcaf2>] do_init_module+0x62/0x220
        kern  :warn  : [    7.192427]  [<ffffffff810ff321>] load_module+0x2631/0x2790
        kern  :warn  : [    7.192432]  [<ffffffff810fb600>] ? ref_module+0x190/0x190
        kern  :warn  : [    7.192436]  [<ffffffff810ff5c6>] SyS_init_module+0x146/0x1a0
        kern  :warn  : [    7.192442]  [<ffffffff815df2a1>] entry_SYSCALL_64_fastpath+0x1e/0x9a
        kern  :warn  : [    7.192445] ---[ end trace ca96e8a34f2d815d ]---
        kern  :err   : [    7.192449] ov5693 i2c-INT33BE:00: Can't create file /proc/camera/frontvid
        kern  :warn  : [    7.192738] ------------[ cut here ]------------
        kern  :warn  : [    7.192743] WARNING: CPU: 0 PID: 222 at fs/proc/generic.c:565 remove_proc_entry+0x173/0x1d0()
        kern  :warn  : [    7.192745] name 'camera'
        kern  :warn  : [    7.192747] Modules linked in: mousedev input_leds hid_generic iTCO_wdt hid_multitouch pmic_whiskey_cove nls_iso8859_1 nls_cp437 vfat fat intel_rapl intel_soc_dts_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd pcspkr usbhid atomisp_css2401a0_v21(+) videobuf_vmalloc videobuf_core mei_txe mei processor_thermal_device lpc_ich shpchp intel_soc_dts_iosf thermal atomisp_ov5693(+) v4l2_common videodev battery i2c_hid hid media snd_intel_sst_acpi snd_intel_sst_core snd_soc_sst_mfld_platform snd_soc_core snd_compress dw_dmac snd_pcm_dmaengine fjes dw_dmac_core ac97_bus snd_pcm snd_timer snd i2c_designware_platform soundcore i2c_designware_core 8250_dw spi_pxa2xx_platform tpm_crb
        kern  :warn  : [    7.192792]  int3400_thermal int3403_thermal acpi_thermal_rel int340x_thermal_zone ac acpi_pad pinctrl_cherryview evdev tpm_tis tpm mac_hid processor sch_fq_codel sg scsi_mod crypto_user fuse ip_tables x_tables ext4 crc16 mbcache jbd2 mmc_block crc32c_intel xhci_pci xhci_hcd usbcore usb_common sdhci_acpi sdhci led_class mmc_core i915 video button i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm intel_agp intel_gtt
        kern  :warn  : [    7.192825] CPU: 0 PID: 222 Comm: systemd-udevd Tainted: G        W       4.4.275-1-intel-aero44-lts linux-surface#28
        kern  :warn  : [    7.192827] Hardware name: Xiaomi Inc Mipad2/Mipad, BIOS MIPad-P4.X64.0043.R03.1603071414 03/07/2016
        kern  :warn  : [    7.192829]  0000000000000286 044a54b37a3a6ee9 ffff88007865f9b0 ffffffff815c4d3b
        kern  :warn  : [    7.192833]  ffff88007865f9f8 ffffffff8172e35d ffff88007865f9e8 ffffffff8107b1c6
        kern  :warn  : [    7.192837]  0000000000000006 0000000000000006 0000000000000000 ffffffffa04bd3e6
        kern  :warn  : [    7.192841] Call Trace:
        kern  :warn  : [    7.192846]  [<ffffffff815c4d3b>] dump_stack+0x6d/0x8b
        kern  :warn  : [    7.192850]  [<ffffffff8107b1c6>] warn_slowpath_common+0x86/0xd0
        kern  :warn  : [    7.192854]  [<ffffffff8107b26c>] warn_slowpath_fmt+0x5c/0x80
        kern  :warn  : [    7.192859]  [<ffffffff812587a3>] remove_proc_entry+0x173/0x1d0
        kern  :warn  : [    7.192865]  [<ffffffffa04bc3b4>] ov5693_probe+0x994/0xd80 [atomisp_ov5693]
        kern  :warn  : [    7.192870]  [<ffffffffa04bba20>] ? power_up+0x190/0x190 [atomisp_ov5693]
        kern  :warn  : [    7.192874]  [<ffffffff81452854>] i2c_device_probe+0x174/0x1f0
        kern  :warn  : [    7.192878]  [<ffffffff81407376>] driver_probe_device+0x206/0x420
        kern  :warn  : [    7.192881]  [<ffffffff8140760e>] __driver_attach+0x7e/0x80
        kern  :warn  : [    7.192884]  [<ffffffff81407590>] ? driver_probe_device+0x420/0x420
        kern  :warn  : [    7.192888]  [<ffffffff81404bea>] bus_for_each_dev+0x8a/0xd0
        kern  :warn  : [    7.192891]  [<ffffffff81406ade>] driver_attach+0x1e/0x20
        kern  :warn  : [    7.192894]  [<ffffffff8140669c>] bus_add_driver+0x1dc/0x240
        kern  :warn  : [    7.192897]  [<ffffffff81407f22>] driver_register+0x92/0xe0
        kern  :warn  : [    7.192901]  [<ffffffff814548a4>] i2c_register_driver+0x44/0xd0
        kern  :warn  : [    7.192904]  [<ffffffffa040c000>] ? 0xffffffffa040c000
        kern  :warn  : [    7.192909]  [<ffffffffa040c017>] ov5693_driver_init+0x17/0x1000 [atomisp_ov5693]
        kern  :warn  : [    7.192913]  [<ffffffff810020b6>] do_one_initcall+0xb6/0x1a0
        kern  :warn  : [    7.192917]  [<ffffffff810fcaf2>] do_init_module+0x62/0x220
        kern  :warn  : [    7.192920]  [<ffffffff810ff321>] load_module+0x2631/0x2790
        kern  :warn  : [    7.192924]  [<ffffffff810fb600>] ? ref_module+0x190/0x190
        kern  :warn  : [    7.192928]  [<ffffffff810ff5c6>] SyS_init_module+0x146/0x1a0
        kern  :warn  : [    7.192932]  [<ffffffff815df2a1>] entry_SYSCALL_64_fastpath+0x1e/0x9a
        kern  :warn  : [    7.192935] ---[ end trace ca96e8a34f2d815e ]---
        kern  :err   : [    7.192939] ov5693 i2c-INT33BE:00: ov5693_probe Failed to proc fs
        kern  :warn  : [    7.193242] ov5693: probe of i2c-INT33BE:00 failed with error -1

Signed-off-by: Tsuchiya Yuto <[email protected]>
  • Loading branch information
@kitakar5525
kitakar5525 committed Aug 5, 2021
1 parent 7b1a574 commit 34defef
Showing 1 changed file with 0 additions and 64 deletions.
64 changes: 0 additions & 64 deletions drivers/media/i2c/micam/atomisp-ov5693.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,57 +723,6 @@ static long ov5693_s_exposure(struct v4l2_subdev *sd,
return ov5693_set_exposure(sd, coarse_itg, analog_gain, digital_gain);
}

static u8 vid = 1;
static struct proc_dir_entry *iddir;
static struct proc_dir_entry *idfile;
static int vendorid_proc_show(struct seq_file *m, void *v)
{
seq_printf(m, "%d\n", vid);
return 0;
}

static int vendorid_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, vendorid_proc_show, NULL);
}

static const struct file_operations vendorid_proc_fops = {
.owner = THIS_MODULE,
.open = vendorid_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};

static int ov5693_vendorid_procfs_init(struct i2c_client *client)
{

idfile = proc_create("camera/frontvid", 0644, NULL,
&vendorid_proc_fops);
if (!idfile) {
dev_err(&client->dev, "Can't create file /proc/camera/frontvid\n");
remove_proc_entry("camera", iddir);
return -EPERM;
}

return 0;
}

static int ov5693_vendorid_procfs_uninit(void)
{
if (idfile != NULL)
proc_remove(idfile);
if (iddir != NULL)
proc_remove(iddir);
return 0;
}

static int ov5693_vendorid_set(u8 vendorid)
{
vid = vendorid;
return 0;
}

static int __check_sum (u8 *buf, int size, u8 sum) {
u8 temp = 0;
int i = 0;
Expand Down Expand Up @@ -928,12 +877,6 @@ static int __ov5693_otp_read(struct v4l2_subdev *sd, u8 *buf)
goto error;
}

/*Set module value*/
if (module == 1)
ov5693_vendorid_set(module);
else
ov5693_vendorid_set(2);

b = tempbuf;
index = 0;
for (i = 3; i < OV5693_OTP_BANK_MAX; i++) {
Expand Down Expand Up @@ -2232,7 +2175,6 @@ static int ov5693_remove(struct i2c_client *client)
atomisp_gmin_remove_subdev(sd);
#endif
media_entity_cleanup(&dev->sd.entity);
ov5693_vendorid_procfs_uninit();

return 0;
}
Expand Down Expand Up @@ -2296,12 +2238,6 @@ static int ov5693_probe(struct i2c_client *client,
if (ret)
ov5693_remove(client);

ret = ov5693_vendorid_procfs_init(client);
if (ret) {
dev_err(&client->dev, "%s Failed to proc fs\n", __func__);
ov5693_vendorid_procfs_uninit();
}

global_dev = dev;

return ret;
Expand Down

0 comments on commit 34defef

Please sign in to comment.